add: check for the existence of a file matched inexactly before adding it The change in 10697f29af2b created a problem on Windows and OS X: --- /usr/local/mercurial/tests/test-issue660.t +++ /usr/local/mercurial/tests/test-issue660.t.err @@ -47,6 +47,8 @@ Should succeed - shadow removed: $ hg add b + adding b/b + b/b does not exist! Prior to the failing 'hg add', the file 'b/b' was added and committed, then 'b' was recursively deleted from the filesystem, file 'b' was created and the delete was recorded with 'hg rm --after'. This add is attempting to record the existence of file 'b'. A filesystem that is not case sensitive prevents dirstate.walk() from skipping its step 3, and step 3 has the effect of inserting removed files into the walk list. The Linux code doesn't run through step 3, and didn't exhibit the problem. It's not clear why a non case sensitive filesystem triggers step 3, given that the path normalization occurs in step 2. Prior to 10697f29af2b, part of the check here was 'f not in repo.dirstate' instead of 'f not in wctx'. Files in the 'r' state are filtered out of context.__contains__() but not dirstate.__contains__(). Therefore the removed file name wasn't added to the list of files to add when checking against dirstate. That change was to allow removed files to be readded, but adding a file that doesn't exist is nonsensical. If the user specifies a missing file, it will be an exact match and will still fail.

     1

Mercurial

     2

=========

     3

     4

Mercurial is a fast, easy to use, distributed revision control tool

     5

for software developers.

     6

     7

Basic install:

     8

     9

 $ make            # see install targets

    10

 $ make install    # do a system-wide install

    11

 $ hg debuginstall # sanity-check setup

    12

 $ hg              # see help

    13

    14

Running without installing:

    15

    16

 $ make local      # build for inplace usage

    17

 $ ./hg --version  # should show the latest version

    18

    19

See http://mercurial.selenic.com/ for detailed installation

    20

instructions, platform-specific notes, and Mercurial user information.