Mercurial > hg
annotate tests/test-merge5.t @ 22288:4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
Before this patch, largefiles in the working directory aren't updated
correctly, if rebase is aborted by conflict. This prevents users from
viewing appropriate largefiles while resolving conflicts.
While rebase, largefiles in the working directory are updated only at
successful committing in the special code path of
"lfilesrepo.commit()".
To update largefiles even if rebase is aborted by conflict, this patch
centralizes the logic of updating largefiles in the working directory
into the "mergeupdate" wrapping "merge.update".
This is a temporary way to fix with less changes. For fundamental
resolution of this kind of problems in the future, largefiles in the
working directory should be updated with other (normal) files
simultaneously while "merge.update" execution: maybe by hooking
"applyupdates".
"Action list based updating" introduced by hooking "applyupdates" will
also improve performance of updating, because it automatically
decreases target files to be checked.
Just after this patch, there are some improper things in "Case 0" code
path of "lfilesrepo.commit()":
- "updatelfiles" invocation is redundant for rebase
- detailed comment doesn't meet to rebase behavior
These will be resolved after the subsequent patch for transplant,
because this code path is shared with transplant.
Even though replacing "merge.update" in rebase extension by "hg.merge"
can also avoid this problem, this patch chooses centralizing the logic
into "mergeupdate", because:
- "merge.update" invocation in rebase extension can't be directly
replaced by "hg.merge", because:
- rebase requires some extra arguments, which "hg.merge" doesn't
take (e.g. "ancestor")
- rebase doesn't require statistics information forcibly displayed
in "hg.merge"
- introducing "mergeupdate" can resolve also problem of some other
code paths directly using "merge.update"
largefiles in the working directory aren't updated regardless of
the result of commands below, before this patch:
- backout (for revisions other than the parent revision of the
working directory without "--merge")
- graft
- histedit (for revisions other than the parent of the working
directory
When "partial" is specified, "merge.update" doesn't update dirstate
entries for standins, even though standins themselves are updated.
In this case, "normallookup" should be used to mark largefiles as
"possibly dirty" forcibly, because applying "normal" on lfdirstate
treats them as "clean" unexpectedly.
This is reason why "normallookup=partial" is specified for
"lfcommands.updatelfiles".
This patch doesn't test "hg rebase --continue", because it doesn't
work correctly if largefiles in the working directory are modified
manually while resolving conflicts. This will be fixed in the next
step of refactoring for largefiles.
All changes of tests/*.t files other than test-largefiles-update.t in
this patch come from invoking "updatelfiles" not after but before
statistics output of "hg.update", "hg.clean" and "hg.merge".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sun, 24 Aug 2014 23:47:26 +0900 |
parents | 41abe2e3e3b7 |
children | fe80fdf68ba7 |
rev | line source |
---|---|
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
1 $ hg init |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
2 $ echo This is file a1 > a |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
3 $ echo This is file b1 > b |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
4 $ hg add a b |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
5 $ hg commit -m "commit #0" |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
6 $ echo This is file b22 > b |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
7 $ hg commit -m "comment #1" |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
8 $ hg update 0 |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
10 $ rm b |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
11 $ hg commit -A -m "comment #2" |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
12 removing b |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
13 created new head |
12154
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
14 $ hg update 1 |
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
16 $ hg update |
19798
76df01e56e7f
update: improve error message for clean non-linear update
Siddharth Agarwal <sid0@fb.com>
parents:
17849
diff
changeset
|
17 abort: not a linear update |
76df01e56e7f
update: improve error message for clean non-linear update
Siddharth Agarwal <sid0@fb.com>
parents:
17849
diff
changeset
|
18 (merge or update --check to force update) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12155
diff
changeset
|
19 [255] |
17849
6da47b655d97
update: check for missing files with --check (issue3595)
Matt Mackall <mpm@selenic.com>
parents:
14485
diff
changeset
|
20 $ rm b |
6da47b655d97
update: check for missing files with --check (issue3595)
Matt Mackall <mpm@selenic.com>
parents:
14485
diff
changeset
|
21 $ hg update -c |
19801
41abe2e3e3b7
update: standardize error message for dirty update --check
Siddharth Agarwal <sid0@fb.com>
parents:
19799
diff
changeset
|
22 abort: uncommitted changes |
17849
6da47b655d97
update: check for missing files with --check (issue3595)
Matt Mackall <mpm@selenic.com>
parents:
14485
diff
changeset
|
23 [255] |
6da47b655d97
update: check for missing files with --check (issue3595)
Matt Mackall <mpm@selenic.com>
parents:
14485
diff
changeset
|
24 $ hg revert b |
12154
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
25 $ hg update -c |
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
26 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
27 $ mv a c |
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
28 |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
29 In theory, we shouldn't need the "-y" below, but it prevents this test |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
30 from hanging when "hg update" erroneously prompts the user for "keep |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
31 or delete". |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
32 |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
33 Should abort: |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
34 |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
35 $ hg update -y 1 |
19799
ab3e42225dbc
update: add error message for dirty non-linear update with no rev
Siddharth Agarwal <sid0@fb.com>
parents:
19798
diff
changeset
|
36 abort: uncommitted changes |
ab3e42225dbc
update: add error message for dirty non-linear update with no rev
Siddharth Agarwal <sid0@fb.com>
parents:
19798
diff
changeset
|
37 (commit or update --clean to discard changes) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12155
diff
changeset
|
38 [255] |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
39 $ mv c a |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
40 |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
41 Should succeed: |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
42 |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
43 $ hg update -y 1 |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
44 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |