mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
da42d55c85
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".
370 lines
10 KiB
Perl
370 lines
10 KiB
Perl
|
|
$ echo "[extensions]" >> $HGRCPATH
|
|
$ echo "largefiles =" >> $HGRCPATH
|
|
|
|
Create the repository outside $HOME since largefiles write to
|
|
$HOME/.cache/largefiles.
|
|
|
|
$ hg init test
|
|
$ cd test
|
|
$ echo "root" > root
|
|
$ hg add root
|
|
$ hg commit -m "Root commit"
|
|
|
|
$ echo "large" > foo
|
|
$ hg add --large foo
|
|
$ hg commit -m "Add foo as a largefile"
|
|
|
|
$ hg update -r 0
|
|
getting changed largefiles
|
|
0 largefiles updated, 1 removed
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo "normal" > foo
|
|
$ hg add foo
|
|
$ hg commit -m "Add foo as normal file"
|
|
created new head
|
|
|
|
Normal file in the working copy, keeping the normal version:
|
|
|
|
$ echo "n" | hg merge --config ui.interactive=Yes
|
|
remote turned local normal file foo into a largefile
|
|
use (l)argefile or keep (n)ormal file? getting changed largefiles
|
|
0 largefiles updated, 0 removed
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg status
|
|
$ cat foo
|
|
normal
|
|
|
|
Normal file in the working copy, keeping the largefile version:
|
|
|
|
$ hg update -q -C
|
|
$ echo "l" | hg merge --config ui.interactive=Yes
|
|
remote turned local normal file foo into a largefile
|
|
use (l)argefile or keep (n)ormal file? getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg status
|
|
M foo
|
|
|
|
$ hg diff --nodates
|
|
diff -r fa129ab6b5a7 .hglf/foo
|
|
--- /dev/null
|
|
+++ b/.hglf/foo
|
|
@@ -0,0 +1,1 @@
|
|
+7f7097b041ccf68cc5561e9600da4655d21c6d18
|
|
diff -r fa129ab6b5a7 foo
|
|
--- a/foo
|
|
+++ /dev/null
|
|
@@ -1,1 +0,0 @@
|
|
-normal
|
|
|
|
$ cat foo
|
|
large
|
|
|
|
Largefile in the working copy, keeping the normal version:
|
|
|
|
$ hg update -q -C -r 1
|
|
$ echo "n" | hg merge --config ui.interactive=Yes
|
|
remote turned local largefile foo into a normal file
|
|
keep (l)argefile or use (n)ormal file? getting changed largefiles
|
|
0 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg status
|
|
M foo
|
|
|
|
$ hg diff --nodates
|
|
diff -r ff521236428a .hglf/foo
|
|
--- a/.hglf/foo
|
|
+++ /dev/null
|
|
@@ -1,1 +0,0 @@
|
|
-7f7097b041ccf68cc5561e9600da4655d21c6d18
|
|
diff -r ff521236428a foo
|
|
--- /dev/null
|
|
+++ b/foo
|
|
@@ -0,0 +1,1 @@
|
|
+normal
|
|
|
|
$ cat foo
|
|
normal
|
|
|
|
Largefile in the working copy, keeping the largefile version:
|
|
|
|
$ hg update -q -C -r 1
|
|
$ echo "l" | hg merge --config ui.interactive=Yes
|
|
remote turned local largefile foo into a normal file
|
|
keep (l)argefile or use (n)ormal file? getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg status
|
|
|
|
$ cat foo
|
|
large
|
|
|
|
Whatever ... commit something so we can invoke merge when updating
|
|
|
|
$ hg commit -m '3: Merge'
|
|
|
|
Updating from largefile to normal - no reason to prompt
|
|
|
|
$ hg up -r 2
|
|
getting changed largefiles
|
|
0 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ cat foo
|
|
normal
|
|
|
|
(the update above used to leave the working dir in a very weird state - clean it
|
|
$ hg up -qr null
|
|
$ hg up -qr 2
|
|
)
|
|
|
|
Updating from normal to largefile - no reason to prompt
|
|
|
|
$ hg up -r 3
|
|
getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ cat foo
|
|
large
|
|
|
|
$ cd ..
|
|
|
|
|
|
Systematic testing of merges involving largefiles:
|
|
|
|
Ancestor: normal Parent: normal= Parent: large result: large
|
|
Ancestor: normal Parent: normal2 Parent: large result: ?
|
|
Ancestor: large Parent: large= Parent: normal result: normal
|
|
Ancestor: large Parent: large2 Parent: normal result: ?
|
|
|
|
All cases should try merging both ways.
|
|
"=" means same file content.
|
|
|
|
Prepare test repo:
|
|
|
|
$ hg init merges
|
|
$ cd merges
|
|
$ touch f1
|
|
$ hg ci -Aqm "0-root" --config extensions.largefiles=!
|
|
|
|
Ensure that .hg/largefiles isn't created before largefiles are added
|
|
#if unix-permissions
|
|
$ chmod 555 .hg
|
|
#endif
|
|
$ hg status
|
|
#if unix-permissions
|
|
$ chmod 755 .hg
|
|
#endif
|
|
|
|
$ test -f .hg/largefiles
|
|
[1]
|
|
|
|
ancestor is "normal":
|
|
$ echo normal > f
|
|
$ hg ci -Aqm "1-normal-ancestor"
|
|
$ touch f2
|
|
$ hg ci -Aqm "2-normal-unchanged"
|
|
$ hg tag -l "normal="
|
|
$ echo normal2 > f
|
|
$ hg ci -m "3-normal2"
|
|
$ hg tag -l "normal2"
|
|
$ hg up -qr 1
|
|
$ hg rm f
|
|
$ echo large > f
|
|
$ hg add --large f
|
|
$ hg ci -qm "4-normal-to-large"
|
|
$ hg tag -l "large"
|
|
|
|
$ hg up -qr null
|
|
|
|
ancestor is "large":
|
|
$ echo large > f
|
|
$ hg add --large f
|
|
$ hg ci -qm "5-large-ancestor"
|
|
$ touch f2
|
|
$ hg ci -Aqm "6-large-unchanged"
|
|
$ hg tag -l "large="
|
|
$ echo large2 > f
|
|
$ hg ci -m "7-large2"
|
|
$ hg tag -l "large2"
|
|
$ hg up -qr 5
|
|
$ hg rm f
|
|
$ echo normal > f
|
|
$ hg ci -qAm "8-large-to-normal"
|
|
$ hg tag -l "normal"
|
|
|
|
Ancestor: normal Parent: normal= Parent: large result: large
|
|
|
|
$ hg up -Cqr normal=
|
|
$ hg merge -r large
|
|
getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
large
|
|
|
|
swap
|
|
|
|
$ hg up -Cqr large
|
|
$ hg merge -r normal=
|
|
getting changed largefiles
|
|
0 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
large
|
|
|
|
Ancestor: normal Parent: normal2 Parent: large result: ?
|
|
(annoying extra prompt ... but it do not do any serious harm)
|
|
|
|
$ hg up -Cqr normal2
|
|
$ hg merge -r large
|
|
local changed f which remote deleted
|
|
use (c)hanged version or (d)elete? c
|
|
remote turned local normal file f into a largefile
|
|
use (l)argefile or keep (n)ormal file? l
|
|
getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
large
|
|
|
|
$ hg up -Cqr normal2
|
|
$ ( echo c; echo n ) | hg merge -r large --config ui.interactive=Yes
|
|
local changed f which remote deleted
|
|
use (c)hanged version or (d)elete? remote turned local normal file f into a largefile
|
|
use (l)argefile or keep (n)ormal file? getting changed largefiles
|
|
0 largefiles updated, 0 removed
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
normal2
|
|
|
|
$ hg up -Cqr normal2
|
|
$ echo d | hg merge -r large --config ui.interactive=Yes
|
|
local changed f which remote deleted
|
|
use (c)hanged version or (d)elete? getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
large
|
|
|
|
swap
|
|
|
|
$ hg up -Cqr large
|
|
$ hg merge -r normal2
|
|
remote changed f which local deleted
|
|
use (c)hanged version or leave (d)eleted? c
|
|
remote turned local largefile f into a normal file
|
|
keep (l)argefile or use (n)ormal file? l
|
|
getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
large
|
|
|
|
$ hg up -Cqr large
|
|
$ ( echo c; echo n ) | hg merge -r normal2 --config ui.interactive=Yes
|
|
remote changed f which local deleted
|
|
use (c)hanged version or leave (d)eleted? remote turned local largefile f into a normal file
|
|
keep (l)argefile or use (n)ormal file? getting changed largefiles
|
|
0 largefiles updated, 0 removed
|
|
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
normal2
|
|
|
|
$ hg up -Cqr large
|
|
$ echo d | hg merge -r normal2 --config ui.interactive=Yes
|
|
remote changed f which local deleted
|
|
use (c)hanged version or leave (d)eleted? getting changed largefiles
|
|
0 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
large
|
|
|
|
Ancestor: large Parent: large= Parent: normal result: normal
|
|
|
|
$ hg up -Cqr large=
|
|
$ hg merge -r normal
|
|
getting changed largefiles
|
|
0 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
normal
|
|
|
|
swap
|
|
|
|
$ hg up -Cqr normal
|
|
$ hg merge -r large=
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
normal
|
|
|
|
Ancestor: large Parent: large2 Parent: normal result: ?
|
|
(annoying extra prompt ... but it do not do any serious harm)
|
|
|
|
$ hg up -Cqr large2
|
|
$ hg merge -r normal
|
|
local changed .hglf/f which remote deleted
|
|
use (c)hanged version or (d)elete? c
|
|
remote turned local largefile f into a normal file
|
|
keep (l)argefile or use (n)ormal file? l
|
|
getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
large2
|
|
|
|
$ hg up -Cqr large2
|
|
$ echo d | hg merge -r normal --config ui.interactive=Yes
|
|
local changed .hglf/f which remote deleted
|
|
use (c)hanged version or (d)elete? getting changed largefiles
|
|
0 largefiles updated, 0 removed
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
normal
|
|
|
|
swap
|
|
|
|
$ hg up -Cqr normal
|
|
$ hg merge -r large2
|
|
remote changed .hglf/f which local deleted
|
|
use (c)hanged version or leave (d)eleted? c
|
|
remote turned local normal file f into a largefile
|
|
use (l)argefile or keep (n)ormal file? l
|
|
getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
large2
|
|
|
|
$ hg up -Cqr normal
|
|
$ echo d | hg merge -r large2 --config ui.interactive=Yes
|
|
remote changed .hglf/f which local deleted
|
|
use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat f
|
|
normal
|
|
|
|
$ cd ..
|