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

merge: use repo.wvfs.setflags() instead of util.setflags()

Browse Source 
Most merge.py code goes through the vfs instead of maniulating
files directly, so let's do the same here.
This commit is contained in:
Phil Cohen 2017-05-11 18:38:43 -07:00
parent 09d53c160b
commit f313a0b236
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/merge.py
View File

@ -1288,7 +1288,7 @@ def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
progress(_updating, z, item=f, total=numupdates, unit=_files)
flags, = args
audit(f)
util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
repo.wvfs.setflags(f, 'l' in flags, 'x' in flags)
updated += 1
# the ordering is important here -- ms.mergedriver will raise if the merge