test-revert: replace 'removed' in working copy with 'untracked-deleted' The 'wccontent' variable has eight different states, four of them tracked, and the other four untracked (at least when the file existed in the parent revision). Among these eight states, 'removed' sticks out by lacking the 'untracked-' prefix despite resulting in an untracked state. To make the symmetry clearer, and to prepare for future patches, rename 'removed' to 'untracked-deleted', which is exactly what it is. Note that, unlike 'remove', 'deleted' is configured in gen-revert-cases.py to have content in the working directory and that that content is instead expected to be removed in the test script. However, no changes are needed to the test script, since it already contains 'hg forget *untracked*' and 'rm *deleted*', which together have the same effect as 'hg remove'. See additional motivation in earlier patch.

     1

  $ cat > abortcommit.py <<EOF

     2

  > from mercurial import util

     3

  > def hook(**args):

     4

  >     raise util.Abort("no commits allowed")

     5

  > def reposetup(ui, repo):

     6

  >     repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook)

     7

  > EOF

     8

  $ abspath=`pwd`/abortcommit.py

     9

    10

  $ echo "[extensions]" >> $HGRCPATH

    11

  $ echo "mq=" >> $HGRCPATH

    12

  $ echo "abortcommit = $abspath" >> $HGRCPATH

    13

    14

  $ hg init foo

    15

  $ cd foo

    16

  $ echo foo > foo

    17

  $ hg add foo

    18

    19

mq may keep a reference to the repository so __del__ will not be

    20

called and .hg/journal.dirstate will not be deleted:

    21

    22

  $ hg ci -m foo

    23

  error: pretxncommit.nocommits hook failed: no commits allowed

    24

  transaction abort!

    25

  rollback completed

    26

  abort: no commits allowed

    27

  [255]

    28

  $ hg ci -m foo

    29

  error: pretxncommit.nocommits hook failed: no commits allowed

    30

  transaction abort!

    31

  rollback completed

    32

  abort: no commits allowed

    33

  [255]

    34

    35

  $ cd ..