Mercurial > hg-stable

diff mercurial/merge.py @ 32286:7e79373263ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use repo.wvfs.setflags() instead of util.setflags() Most merge.py code goes through the vfs instead of maniulating files directly, so let's do the same here.
author Phil Cohen <phillco@fb.com>
date Thu, 11 May 2017 18:38:43 -0700
parents 4d504e541d3d
children c568c187102f
line wrap: on
line diff
--- a/mercurial/merge.py	Fri May 12 11:20:25 2017 -0700
+++ b/mercurial/merge.py	Thu May 11 18:38:43 2017 -0700
@@ -1288,7 +1288,7 @@
         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