add dirstate debugging commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add dirstate debugging commands As I've played with various different merges and more recently rawcommit, I've found the following patch to be very very helpful in figuring out whether the dirstate is being left in a consistent or inconsistent state with respect to the current manifest. I attempted to deduce the invariants that were assumed by the current code, and then check it in this code. I may or may not have captured the design intent in this check; if not, I'd be very happy to hear more clearly what was intended, so that I can write tests to that expectation. Anyway, here's the patch. Not sure if it's a good idea to commit it to the mainline, or just leave it as a debugging aid. I attempted to package it so that it doesn't interfere with normal usage. Michael Fetterman (tweaked by mpm: remove -d magic) manifest hash: 869f5b5f954dc0f46ba27322359e811d5e21d71c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvP77ywK+sNU5EO8RArmtAKCCVuI2slANzWZ26P5edtH/ixdwNwCfZLWl 5P+V+C92II3usO4YW2MULKY= =/Pv4 -----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

T1=""; T2=""

     7

cleanup_exit() {

     8

    rm -f "$T1" "$T2"

     9

    exit $1

    10

}

    11

    12

case "${EDITOR:=vi}" in

    13

    emacs)

    14

        EDITOR="$EDITOR -nw"

    15

        ;;

    16

    gvim|vim)

    17

        EDITOR="$EDITOR -f -o"

    18

        ;;

    19

esac

    20

    21

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

    22

    # we don't sign merges

    23

    exec $EDITOR "$1"

    24

else

    25

    T1=`mktemp`; T2=`mktemp`

    26

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

    27

    28

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

    29

    grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1"

    30

    hg diff >> "$T2"

    31

    32

    CHECKSUM=`md5sum "$T1"`

    33

    $EDITOR "$T1" "$T2" || cleanup_exit $?

    34

    echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 0

    35

    {

    36

        head -1 "$T1"

    37

        echo

    38

        grep -v "^HG:" "$T1" | gpg -a -u "${HGUSER:-$EMAIL}" --clearsign

    39

    } > "$T2" && mv "$T2" "$1"

    40

    cleanup_exit $?

    41

fi

    42