hg pull: more query fixes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg pull: more query fixes Pull was getting confused by single-element branches because it had seen the top end already. Also, the previous change to do seenbranch on the base of the branch was bogus. Minor cleanup and a bit more diagnostics in the branch-narrowing code. manifest hash: 71d4dced9f74bef43d3a54d086dccd0a96d68e26 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrjLgywK+sNU5EO8RAsxSAJ92U31Pz7K14Ctje4SEec2857Ut7QCgoVwY ho65mloslCSidLsEnxYfBDI= =Wts9 -----END PGP SIGNATURE-----

     1

#!/bin/bash

     2

#

     3

# This is an example of using HGEDITOR to automate the signing of

     4

# commits and so on.

     5

     6

MANIFEST=`grep '^HG: manifest hash' $1 | cut -b 19-`

     7

if grep -q "^HG: merge resolve" $1 ; then

     8

    # we don't sign merges

     9

    $EDITOR $1

    10

else

    11

    T=`mktemp`

    12

    CHANGED=`grep '^HG: changed' $1 | cut -b 13-`

    13

    # show a diff so writing commit comments is easier

    14

    hg diff $CHANGED >> $T

    15

    echo -e "\n\nmanifest hash: $MANIFEST" > $1

    16

    emacs -nw $T $1 

    17

    head -1 $1 > $T

    18

    echo >> $T

    19

    gpg -a -u $HGUSER -o - --clearsign $1 >> $T

    20

    mv $T $1

    21

fi