Refactor diffrevs/diffdir into changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Refactor diffrevs/diffdir into changes Add dirstate.changes to replace most of diffdir Add localrepository.changes to replace diffrevs/diffdir This code can now efficiently check for changes in single files, and often without consulting the manifest. This should eventually make 'hg diff Makefile' in a large project much faster. This also fixes a bug where 'hg diff -r tip' failed to account for files that had been added but not committed yet. manifest hash: 20fde5d4b4cee49a76bcfe50f2dacf58b1f2258b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxMxpywK+sNU5EO8RAhzOAJ9VLQJoC+hiRYQtTSPbDhXBEJfQZwCgpDx9 GAwQ9jZHNsgXckBfXNCkJV8= =hMuc -----END PGP SIGNATURE-----

     1

+ hg init

     2

+ echo nothing

     3

+ hg add a

     4

+ hg commit -t ancestor -u test -d '0 0'

     5

+ echo something

     6

+ hg commit -t branch1 -u test -d '0 0'

     7

+ hg co 0

     8

+ echo 'something else'

     9

+ hg commit -t branch2 -u test -d '0 0'

    10

+ export HGMERGE=merge

    11

+ HGMERGE=merge

    12

+ hg -d up -m 1

    13

merge: warning: conflicts during merge

    14

resolving manifests

    15

 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc

    16

 a versions differ, resolve

    17

working dir created .out, keeping

    18

merging a

    19

resolving a

    20

file a: other d7250518cb1b ancestor 68ba9db7a9e4

    21

merging a failed!

    22

+ hg id

    23

32e80765d7fe+75234512624c+ tip

    24

+ grep -Ev '>>>|<<<' a

    25

something else

    26

=======

    27

something

    28

+ hg status

    29

C a

    30

? .out