Mercurial > hg
annotate tests/test-copy-move-merge.t @ 24787:9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Before, a --clean update with largefiles would use the "optimization" that it
didn't read hashes from standin files before and after the update. Instead of
trusting the content of the standin files, it would rehash all the actual
largefiles that lfdirstate reported clean and update the standins that didn't
have the expected content. It could thus in some "impossible" situations
automatically recover from some "largefile got out sync with its standin"
issues (even there apparently still were weird corner cases where it could
fail). This extra checking is similar to what core --clean intentionally do
not do, and it made update --clean unbearable slow.
Usually in core Mercurial, --clean will rely on the dirstate to find the files
it should update. (It is thus intentionally possible (when trying to trick the
system or if there should be bugs) to end up in situations where --clean not
will restore the working directory content correctly.) Checking every file when
we "know" it is ok is however not an option - that would be too slow.
Instead, trust the content of the standin files. Use the same logic for --clean
as for linear updates and trust the dirstate and that our "logic" will keep
them in sync. It is much cheaper to just rehash the largefiles reported dirty
by a status walk and read all standins than to hash largefiles.
Most of the changes are just a change of indentation now when the different
kinds of updates no longer are handled that differently. Standins for added
files are however only written when doing a normal update, while deleted and
removed files only will be updated for --clean updates.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 15 Apr 2015 15:22:16 -0400 |
parents | cb15835456cb |
children | bd625cd4e5e7 |
rev | line source |
---|---|
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12156
diff
changeset
|
1 $ hg init t |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
2 $ cd t |
5059
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
4 $ echo 1 > a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11972
diff
changeset
|
5 $ hg ci -qAm "first" |
5059
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
7 $ hg cp a b |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
8 $ hg mv a c |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
9 $ echo 2 >> b |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
10 $ echo 2 >> c |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
11 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11972
diff
changeset
|
12 $ hg ci -qAm "second" |
5059
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
14 $ hg co -C 0 |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
15 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
16 |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
17 $ echo 0 > a |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
18 $ echo 1 >> a |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
19 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11972
diff
changeset
|
20 $ hg ci -qAm "other" |
5059
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
21 |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
22 $ hg merge --debug |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
23 searching for copies back to rev 1 |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
24 unmatched files in other: |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
25 b |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
26 c |
16795
e9ae770eff1c
merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15625
diff
changeset
|
27 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
18362
5a4f220fbfca
copies: report found copies sorted
Mads Kiilerich <mads@kiilerich.com>
parents:
18360
diff
changeset
|
28 src: 'a' -> dst: 'b' * |
18135
a6fe1b9cc68f
copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
29 src: 'a' -> dst: 'c' * |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
30 checking for directory renames |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
31 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
32 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
20945
diff
changeset
|
34 preserving a for resolve of b |
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
20945
diff
changeset
|
35 preserving a for resolve of c |
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
20945
diff
changeset
|
36 removing a |
20945
18adc15635a1
merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18605
diff
changeset
|
37 b: remote moved from a -> m |
18adc15635a1
merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18605
diff
changeset
|
38 updating: b 1/2 files (50.00%) |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
39 picked tool 'internal:merge' for b (binary False symlink False) |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
40 merging a and b to b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11972
diff
changeset
|
41 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
42 premerge successful |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
20945
diff
changeset
|
43 c: remote moved from a -> m |
20945
18adc15635a1
merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18605
diff
changeset
|
44 updating: c 2/2 files (100.00%) |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
45 picked tool 'internal:merge' for c (binary False symlink False) |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
46 merging a and c to c |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11972
diff
changeset
|
47 my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
48 premerge successful |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
49 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
50 (branch merge, don't forget to commit) |
5059
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
51 |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
52 file b |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
53 $ cat b |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
54 0 |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
55 1 |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
56 2 |
5059
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
57 |
11972
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
58 file c |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
59 $ cat c |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
60 0 |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
61 1 |
b708cadc6e8f
tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5059
diff
changeset
|
62 2 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16795
diff
changeset
|
63 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16795
diff
changeset
|
64 $ cd .. |