mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
8c6b77e441
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) |
||
---|---|---|
.. | ||
convert | ||
highlight | ||
largefiles | ||
zeroconf | ||
__init__.py | ||
acl.py | ||
blackbox.py | ||
bugzilla.py | ||
children.py | ||
churn.py | ||
color.py | ||
eol.py | ||
extdiff.py | ||
factotum.py | ||
fetch.py | ||
gpg.py | ||
graphlog.py | ||
hgcia.py | ||
hgk.py | ||
histedit.py | ||
keyword.py | ||
mq.py | ||
notify.py | ||
pager.py | ||
patchbomb.py | ||
progress.py | ||
purge.py | ||
rebase.py | ||
record.py | ||
relink.py | ||
schemes.py | ||
share.py | ||
shelve.py | ||
strip.py | ||
transplant.py | ||
win32mbcs.py | ||
win32text.py |