largefiles: use "normallookup" on "lfdirstate" while reverting
Before this patch, largefiles gotten from revisions other than the
parent of the working directory at "hg revert" become "clean"
unexpectedly in steps below:
1. "repo.status()" is invoked (for status check before reverting)
1-1 "dirstate" entry for standinfile SF is "normal"-ed
(1-2 "lfdirstate" entry of largefile LF (for SF) is "normal"-ed)
2. "cmdutil.revert()" is invoked
2-1 standinfile SF is updated in the working directory
2-2 "dirstate" entry for SF is NOT updated
3. "lfcommands.updatelfiles()" is invoked (by "overrides.overriderevert()")
3-1 largefile LF (for SF) is updated in the working directory
3-2 "dirstate" returns "n" and valid timestamp for SF (by 1-1 and 2-2)
3-3 "lfdirstate" entry for LF is "normal"-ed
3-4 "lfdirstate" is written into ".hg/largefiles/dirstate", and
timestamp of LF is stored into "lfdirstate" file (by 3-3)
(ASSUMPTION: timestamp of LF differs from one of "lfdirstate" file)
Then, "hs status" treats LF as "clean", even though LF is updated by
"other" revision (by 3-1), because "lfilesrepo.status()" always treats
"normal"-ed files (by 3-3 and 3-4) as "clean".
When largefiles are reverted, they should be "normallookup"-ed
forcibly.
This patch uses "normallookup" on "lfdirstate" while reverting, by
passing "True" to newly added argument "normallookup".
Forcible "normallookup"-ing is not so expensive, because list of
target largefiles is explicitly specified in this case.
This patch uses "[debug] dirstate.delaywrite" feature in the test, to
ensure that timestamp of the largefile gotten from "other" revision is
stored into ".hg/largefiles/dirstate" (for ASSUMPTION at 3-4)
--- a/hgext/largefiles/lfcommands.py Wed Jul 23 00:10:24 2014 +0900
+++ b/hgext/largefiles/lfcommands.py Wed Jul 23 00:10:24 2014 +0900
@@ -435,7 +435,8 @@
ui.status(_("%d largefiles failed to download\n") % totalmissing)
return totalsuccess, totalmissing
-def updatelfiles(ui, repo, filelist=None, printmessage=True):
+def updatelfiles(ui, repo, filelist=None, printmessage=True,
+ normallookup=False):
wlock = repo.wlock()
try:
lfdirstate = lfutil.openlfdirstate(ui, repo)
@@ -516,7 +517,7 @@
else:
state, mtime = '?', -1
if state == 'n':
- if mtime < 0:
+ if normallookup or mtime < 0:
# state 'n' doesn't ensure 'clean' in this case
lfdirstate.normallookup(lfile)
else:
--- a/hgext/largefiles/overrides.py Wed Jul 23 00:10:24 2014 +0900
+++ b/hgext/largefiles/overrides.py Wed Jul 23 00:10:24 2014 +0900
@@ -667,7 +667,13 @@
newstandins = lfutil.getstandinsstate(repo)
filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
- lfcommands.updatelfiles(ui, repo, filelist, printmessage=False)
+ # lfdirstate should be 'normallookup'-ed for updated files,
+ # because reverting doesn't touch dirstate for 'normal' files
+ # when target revision is explicitly specified: in such case,
+ # 'n' and valid timestamp in dirstate doesn't ensure 'clean'
+ # of target (standin) file.
+ lfcommands.updatelfiles(ui, repo, filelist, printmessage=False,
+ normallookup=True)
finally:
wlock.release()
--- a/tests/test-largefiles-update.t Wed Jul 23 00:10:24 2014 +0900
+++ b/tests/test-largefiles-update.t Wed Jul 23 00:10:24 2014 +0900
@@ -79,4 +79,24 @@
$ 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
+
$ cd ..