annotate hgeditor @ 333:d60a3060f9e2

hg rawcommit: fix files arg conflict -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg rawcommit: fix files arg conflict I try to sync with tip again. I found out the raw commit is broken for me because the keyword "files" is list as named argument as well so it will not show up in the rc dictionary. Here is my quick fix to make it work with my script again. Chris manifest hash: 10f85636e02cb4b19b319b7ebbfd2ec5096c3a6d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr1HSywK+sNU5EO8RArWMAJoD67SPN4QJcVaHBVh9FiNXWy80FQCePpA/ BZ63h+bqXESeMMLb7Kh5ytA= =69X0 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 14 Jun 2005 13:53:22 -0800
parents a69c3b2957d1
children 442eb02cf870 b2293093b89e b4e0e20646bb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
186
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
1 #!/bin/bash
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
2 #
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
3 # This is an example of using HGEDITOR to automate the signing of
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
4 # commits and so on.
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
5
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
6 MANIFEST=`grep '^HG: manifest hash' $1 | cut -b 19-`
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
7 if grep -q "^HG: merge resolve" $1 ; then
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
8 # we don't sign merges
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
9 $EDITOR $1
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
10 else
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
11 T=`mktemp`
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
12 CHANGED=`grep '^HG: changed' $1 | cut -b 13-`
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
13 # show a diff so writing commit comments is easier
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
14 hg diff $CHANGED >> $T
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
15 echo -e "\n\nmanifest hash: $MANIFEST" > $1
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
16 emacs -nw $T $1
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
17 head -1 $1 > $T
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
18 echo >> $T
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
19 gpg -a -u $HGUSER -o - --clearsign $1 >> $T
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
20 mv $T $1
9a2075c0b9b8 Add $HGEDITOR hook and example script
mpm@selenic.com
parents:
diff changeset
21 fi