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

#!/usr/bin/env python

     2

     3

__doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.

     4

Without this svn will not detect workspace changes."""

     5

     6

import sys, os

     7

     8

text = sys.argv[1]

     9

fname = sys.argv[2]

    10

    11

f = open(fname, "ab")

    12

try:

    13

    before = os.fstat(f.fileno()).st_mtime

    14

    f.write(text)

    15

    f.write("\n")

    16

finally:

    17

    f.close()

    18

inc = 1

    19

now = os.stat(fname).st_mtime

    20

while now == before:

    21

    t = now + inc

    22

    inc += 1

    23

    os.utime(fname, (t, t))

    24

    now = os.stat(fname).st_mtime

    25