mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
d98ab37761
Before this patch, after successful "hg rebase" of the revision removing largefiles, "hg status" may still show ""R" for such largefiles unexpectedly. "lfilesrepo.commit" executes the special code path for automated committing while rebase/transplant, and lfdirstate entries for removed files aren't updated in this code path, even after successful committing. Then, "R" entries still existing in lfdirstate cause unexpected "hg status" output. This patch synchronizes lfdirstate with dirstate after automated committing. This patch passes False as "normallookup" to "synclfdirstate", because modified files in "files()" of the recent (= just committed) context should be "normal"-ed. This is a temporary way to fix with less changes. For fundamental resolution of this kind of problems in the future, lfdirstate should be updated with dirstate simultaneously. Hooking "markcommitted" of ctx in "localrepository.commitctx" may achieve this. This problem occurs, only when (1) the parent of the working directory is rebased and (2) it removes largefiles, because: - if the parent of the working directory isn't rebased, returning to the initial revision (= update) after rebase hides this problem - files added on "other" branch (= rebase target) are treated not as "added" but as "modified" (= "normal" status and "unset" timestamp) at merging This patch tests also the status of added largefile, but it is only for avoiding regression. In addition to conditions above, "hg status" must not take existing files to reproduce this problem, because existing files make "match._files" not empty in "lfilesrepo.status" code path below: def sfindirstate(f): sf = lfutil.standin(f) dirstate = self.dirstate return sf in dirstate or sf in dirstate.dirs() match._files = [f for f in match._files if sfindirstate(f)] Not empty "match._files" prevents "status" on lfdirstate from returning the result containing problematic "R" files. This is reason why "large1" (removed) and "largeX" (added) are checked separately in this patch. Problematic code path in "lfilesrepo.commit" is used also by "hg transplant", but this problem doesn't occur at "hg transplant", because invocation of "updatelfiles" after transplant-ing in "overridetransplant" causes cleaning lfdirstate up. This patch tests also "hg transplant" as same as "hg rebase", but it is only for avoiding regression.
171 lines
4.3 KiB
Perl
171 lines
4.3 KiB
Perl
This file focuses mainly on updating largefiles in the working
|
|
directory (and ".hg/largefiles/dirstate")
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [ui]
|
|
> merge = internal:fail
|
|
> [extensions]
|
|
> largefiles =
|
|
> EOF
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ echo large1 > large1
|
|
$ echo large2 > large2
|
|
$ hg add --large large1 large2
|
|
$ echo normal1 > normal1
|
|
$ hg add normal1
|
|
$ hg commit -m '#0'
|
|
$ echo 'large1 in #1' > large1
|
|
$ echo 'normal1 in #1' > normal1
|
|
$ hg commit -m '#1'
|
|
$ hg update -q -C 0
|
|
$ echo 'large2 in #2' > large2
|
|
$ hg commit -m '#2'
|
|
created new head
|
|
|
|
Test that "hg merge" updates largefiles from "other" correctly
|
|
|
|
(getting largefiles from "other" normally)
|
|
|
|
$ hg status -A large1
|
|
C large1
|
|
$ cat large1
|
|
large1
|
|
$ cat .hglf/large1
|
|
4669e532d5b2c093a78eca010077e708a071bb64
|
|
$ hg merge --config debug.dirstate.delaywrite=2
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
$ hg status -A large1
|
|
M large1
|
|
$ cat large1
|
|
large1 in #1
|
|
$ cat .hglf/large1
|
|
58e24f733a964da346e2407a2bee99d9001184f5
|
|
$ hg diff -c 1 --nodates .hglf/large1 | grep '^[+-][0-9a-z]'
|
|
-4669e532d5b2c093a78eca010077e708a071bb64
|
|
+58e24f733a964da346e2407a2bee99d9001184f5
|
|
|
|
(getting largefiles from "other" via conflict prompt)
|
|
|
|
$ hg update -q -C 2
|
|
$ echo 'large1 in #3' > large1
|
|
$ echo 'normal1 in #3' > normal1
|
|
$ hg commit -m '#3'
|
|
$ cat .hglf/large1
|
|
e5bb990443d6a92aaf7223813720f7566c9dd05b
|
|
$ hg merge --config debug.dirstate.delaywrite=2 --config ui.interactive=True <<EOF
|
|
> o
|
|
> EOF
|
|
largefile large1 has a merge conflict
|
|
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
|
|
keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
|
|
take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? merging normal1
|
|
warning: conflicts during merge.
|
|
merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark')
|
|
0 files updated, 1 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
[1]
|
|
$ hg status -A large1
|
|
M large1
|
|
$ cat large1
|
|
large1 in #1
|
|
$ cat .hglf/large1
|
|
58e24f733a964da346e2407a2bee99d9001184f5
|
|
|
|
Test that "hg revert -r REV" updates largefiles from "REV" correctly
|
|
|
|
$ hg update -q -C 3
|
|
$ hg status -A large1
|
|
C large1
|
|
$ cat large1
|
|
large1 in #3
|
|
$ cat .hglf/large1
|
|
e5bb990443d6a92aaf7223813720f7566c9dd05b
|
|
$ hg diff -c 1 --nodates .hglf/large1 | grep '^[+-][0-9a-z]'
|
|
-4669e532d5b2c093a78eca010077e708a071bb64
|
|
+58e24f733a964da346e2407a2bee99d9001184f5
|
|
$ hg revert --no-backup -r 1 --config debug.dirstate.delaywrite=2 large1
|
|
$ hg status -A large1
|
|
M large1
|
|
$ cat large1
|
|
large1 in #1
|
|
$ cat .hglf/large1
|
|
58e24f733a964da346e2407a2bee99d9001184f5
|
|
|
|
Test that "hg rollback" restores status of largefiles correctly
|
|
|
|
$ hg update -C -q
|
|
$ hg remove large1
|
|
$ hg forget large2
|
|
$ echo largeX > largeX
|
|
$ hg add --large largeX
|
|
$ hg commit -m 'will be rollback-ed soon'
|
|
$ echo largeY > largeY
|
|
$ hg add --large largeY
|
|
$ hg status -A large1
|
|
large1: No such file or directory
|
|
$ hg status -A large2
|
|
? large2
|
|
$ hg status -A largeX
|
|
C largeX
|
|
$ hg status -A largeY
|
|
A largeY
|
|
$ hg rollback
|
|
repository tip rolled back to revision 3 (undo commit)
|
|
working directory now based on revision 3
|
|
$ hg status -A large1
|
|
R large1
|
|
$ hg status -A large2
|
|
R large2
|
|
$ hg status -A largeX
|
|
A largeX
|
|
$ hg status -A largeY
|
|
? largeY
|
|
|
|
Test that "hg status" shows status of largefiles correctly just after
|
|
automated commit like rebase/transplant
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> rebase =
|
|
> strip =
|
|
> transplant =
|
|
> EOF
|
|
$ hg update -q -C 1
|
|
$ hg remove large1
|
|
$ echo largeX > largeX
|
|
$ hg add --large largeX
|
|
$ hg commit -m '#4'
|
|
|
|
$ hg rebase -s 1 -d 2 --keep
|
|
$ hg status -A large1
|
|
large1: No such file or directory
|
|
$ hg status -A largeX
|
|
C largeX
|
|
$ hg strip -q 5
|
|
|
|
$ hg update -q -C 2
|
|
$ hg transplant -q 1 4
|
|
$ hg status -A large1
|
|
large1: No such file or directory
|
|
$ hg status -A largeX
|
|
C largeX
|
|
$ hg strip -q 5
|
|
|
|
$ hg update -q -C 2
|
|
$ hg transplant -q --merge 1 --merge 4
|
|
$ hg status -A large1
|
|
large1: No such file or directory
|
|
$ hg status -A largeX
|
|
C largeX
|
|
$ hg strip -q 5
|
|
|
|
$ cd ..
|