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

+ mkdir test

     2

+ cd test

     3

+ echo foo

     4

+ hg init

     5

+ hg addremove

     6

+ hg commit -t 1

     7

+ hg verify

     8

checking changesets

     9

checking manifests

    10

crosschecking files in changesets and manifests

    11

checking files

    12

1 files, 1 changesets, 1 total revisions

    13

+ cd ..

    14

+ mkdir branch

    15

+ cd branch

    16

+ hg init ../test

    17

+ hg co

    18

+ echo bar

    19

+ hg commit -t 2

    20

+ cd ../test

    21

+ hg pull ../branch

    22

pulling from ../branch

    23

searching for changes

    24

adding changesets

    25

adding manifests

    26

adding file revisions

    27

modified 1 files, added 1 changesets and 1 new revisions

    28

(run 'hg update' to get a working copy)

    29

+ hg verify

    30

checking changesets

    31

checking manifests

    32

crosschecking files in changesets and manifests

    33

checking files

    34

1 files, 2 changesets, 2 total revisions

    35

+ hg co

    36

+ cat foo

    37

foo

    38

bar

    39

+ hg manifest

    40

6f4310b00b9a147241b071a60c28a650827fb03d 644 foo