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

A simple testing framework

     2

     3

To run the tests, do:

     4

     5

cd tests/

     6

./run-tests

     7

     8

This finds all scripts in the test directory named test-* and executes

     9

them. The scripts can be either shell scripts or Python. Each test is

    10

run in a temporary directory that is removed when the test is complete.

    11

    12

A test-<x> succeeds if the script returns success and its output

    13

matches test-<x>.out. If the new output doesn't match, it is stored in

    14

test-<x>.err.

    15

    16

There are some tricky points here that you should be aware of when

    17

writing tests:

    18

    19

- hg commit and hg up -m want user interaction

    20

    21

  for commit use -t "text"

    22

  for hg up -m, set HGMERGE to something noninteractive (like true or merge)

    23

    24

- changeset hashes will change based on user and date which make

    25

  things like hg history output change

    26

    27

  use commit -t "test" -u test -d "0 0"

    28

    29

- diff will show the current time

    30

    31

  use hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/" to strip dates

    32

    33

- set -x and pipelines don't generate stable output

    34

    35

  turn off set -x or break pipelines into pieces

    36