tests/test-diffdir
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 09 Jun 2007 01:04:28 -0300
changeset 4531 b51a8138292a
parent 4208 f80cf8b7bbd9
permissions -rwxr-xr-x
Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/sh
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     2
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     3
hg init
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     4
touch a
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     5
hg add a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1723
diff changeset
     6
hg ci -m "a" -d "1000000 0"
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     7
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     8
echo 123 > b
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     9
hg add b
3192
096f1c73cdc3 Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents: 1933
diff changeset
    10
hg diff --nodates
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
    11
3192
096f1c73cdc3 Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents: 1933
diff changeset
    12
hg diff --nodates -r tip
1723
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 981
diff changeset
    13
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 981
diff changeset
    14
echo foo > a
3192
096f1c73cdc3 Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents: 1933
diff changeset
    15
hg diff --nodates
3822
000d122071b5 fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3192
diff changeset
    16
000d122071b5 fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3192
diff changeset
    17
hg diff -r ""
000d122071b5 fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3192
diff changeset
    18
hg diff -r tip -r ""
000d122071b5 fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3192
diff changeset
    19
000d122071b5 fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3192
diff changeset
    20
true