changeset 33096:873f638fd7db

merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function As with previous changes in this series, this should be a no-op.
author Phil Cohen <phillco@fb.com>
date Sun, 25 Jun 2017 22:29:09 -0700
parents 05c680ebf512
children 1e79c66d6b07
files mercurial/context.py mercurial/merge.py
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Sun Jun 25 17:00:15 2017 -0700
+++ b/mercurial/context.py	Sun Jun 25 22:29:09 2017 -0700
@@ -1896,6 +1896,9 @@
         """wraps repo.wwrite"""
         self._repo.wwrite(self._path, data, flags)
 
+    def setflags(self, l, x):
+        self._repo.wvfs.setflags(self._path, l, x)
+
 class workingcommitctx(workingctx):
     """A workingcommitctx object makes access to data related to
     the revision being committed convenient.
--- a/mercurial/merge.py	Sun Jun 25 17:00:15 2017 -0700
+++ b/mercurial/merge.py	Sun Jun 25 22:29:09 2017 -0700
@@ -1291,7 +1291,7 @@
         progress(_updating, z, item=f, total=numupdates, unit=_files)
         flags, = args
         audit(f)
-        repo.wvfs.setflags(f, 'l' in flags, 'x' in flags)
+        wctx[f].setflags('l' in flags, 'x' in flags)
         updated += 1
 
     # the ordering is important here -- ms.mergedriver will raise if the merge