facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

largefiles: omit updating newly added standin at linear merging

Browse Source 
Updating standin for newly added largefile is needed, only if same
name largefile exists in destination context at linear merging. In
such case, updated standin is used to detect divergence of largefile
at overridefilemerge().

Otherwise, standin doesn't have any responsibility for its content
(usually, it is empty).
This commit is contained in:
FUJIWARA Katsunori 2017-03-27 09:44:34 +09:00
parent 6fcd56dea5
commit 068a31b4e7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hgext/largefiles/overrides.py
View File

@ -1397,6 +1397,7 @@ def mergeupdate(orig, repo, node, branchmerge, force,
[], False, True, False)
oldclean = set(s.clean)
pctx = repo['.']
dctx = repo[node]
for lfile in unsure + s.modified:
lfileabs = repo.wvfs.join(lfile)
if not repo.wvfs.exists(lfileabs):
@ -1409,7 +1410,12 @@ def mergeupdate(orig, repo, node, branchmerge, force,
lfhash == lfutil.readstandin(repo, lfile, pctx)):
oldclean.add(lfile)
for lfile in s.added:
lfutil.updatestandin(repo, lfutil.standin(lfile))
fstandin = lfutil.standin(lfile)
if fstandin not in dctx:
# in this case, content of standin file is meaningless
# (in dctx, lfile is unknown, or normal file)
continue
lfutil.updatestandin(repo, fstandin)
# mark all clean largefiles as dirty, just in case the update gets
# interrupted before largefiles and lfdirstate are synchronized
for lfile in oldclean: