addremove: add back forgotten files (BC) After running "hg forget README && hg addremove", README will still be reported as removed, while "hg forget README && hg add README" adds it back so it gets reported as clean. It seems like they should behave the same. Furthermore, it seems like no files should remain untracked after 'hg addremove && hg commit' (or 'hg commit -A'). For these reasons, change the behavior of addremove so it does add forgotten files back. The problem is with scmutil._interestingfiles(), which reports the file as removed, so scmutil.addremove() does not add it. Fix by teaching _interestingfiles() to report forgotten files separately from removed files and make addremove() add forgotten files back. However, do not treat forgotten files as sources for rename detection. Note that since removed and forgotten files are treated the same before this change, forgotten files were considered sources for rename detection. Also update the other caller, marktouched(), in the same way as addremove().

     1

  $ hg init rep

     2

  $ cd rep

     3

  $ mkdir dir

     4

  $ touch foo dir/bar

     5

  $ hg -v addremove

     6

  adding dir/bar

     7

  adding foo

     8

  $ hg -v commit -m "add 1"

     9

  dir/bar

    10

  foo

    11

  committed changeset 0:6f7f953567a2

    12

  $ cd dir/

    13

  $ touch ../foo_2 bar_2

    14

  $ hg -v addremove

    15

  adding dir/bar_2

    16

  adding foo_2

    17

  $ hg -v commit -m "add 2"

    18

  dir/bar_2

    19

  foo_2

    20

  committed changeset 1:e65414bf35c5

    21

  $ cd ..

    22

  $ hg forget foo

    23

  $ hg -v addremove

    24

  adding foo

    25

  $ cd ..

    26

    27

  $ hg init sim

    28

  $ cd sim

    29

  $ echo a > a

    30

  $ echo a >> a

    31

  $ echo a >> a

    32

  $ echo c > c

    33

  $ hg commit -Ama

    34

  adding a

    35

  adding c

    36

  $ mv a b

    37

  $ rm c

    38

  $ echo d > d

    39

  $ hg addremove -n -s 50 # issue 1696

    40

  removing a

    41

  adding b

    42

  removing c

    43

  adding d

    44

  recording removal of a as rename to b (100% similar)

    45

  $ hg addremove -s 50

    46

  removing a

    47

  adding b

    48

  removing c

    49

  adding d

    50

  recording removal of a as rename to b (100% similar)

    51

  $ hg commit -mb

    52

  $ cp b c

    53

  $ hg forget b

    54

  $ hg addremove -s 50

    55

  adding b

    56

  adding c

    57

  $ cd ..