hgmerge: use diff3 if available
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hgmerge: use diff3 if available
diff3 may be more readily available than merge
manifest hash: 67a314ac42aa78410d64a6c3d36c2d575a588533
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoRUtywK+sNU5EO8RAmFPAJ0aN8VNvN9zpE/zov6wT3M98vGfDwCfXEOk
xZlQHYIGrCLOFQiCQxIfr7I=
=Asv9
-----END PGP SIGNATURE-----
#!/bin/bash
#
# This is an example of using HGEDITOR to automate the signing of
# commits and so on.
MANIFEST=`grep '^HG: manifest hash' $1 | cut -b 19-`
if grep -q "^HG: merge resolve" $1 ; then
# we don't sign merges
$EDITOR $1
else
T=`mktemp`
CHANGED=`grep '^HG: changed' $1 | cut -b 13-`
# show a diff so writing commit comments is easier
hg diff $CHANGED >> $T
echo -e "\n\nmanifest hash: $MANIFEST" > $1
emacs -nw $T $1
head -1 $1 > $T
echo >> $T
gpg -a -u $HGUSER -o - --clearsign $1 >> $T
mv $T $1
fi