From 522fc7d98c8180d7933b4013f7dc55512d0b1248 Mon Sep 17 00:00:00 2001 From: Phil Cohen Date: Sun, 25 Jun 2017 17:00:15 -0700 Subject: [PATCH] merge: convert repo.wwrite() calls to wctx[f].write() As with the previous patch in this series, workingfilectx.write() is a direct call to repo.wwrite(), so this change should be a no-op. --- mercurial/merge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mercurial/merge.py b/mercurial/merge.py index b5e7f2697c..1d885a3fed 100644 --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -492,7 +492,7 @@ class mergestate(object): # restore local if hash != nullhex: f = self._repo.vfs('merge/' + hash) - self._repo.wwrite(dfile, f.read(), flags) + wctx[dfile].write(f.read(), flags) f.close() else: wctx[dfile].remove(ignoremissing=True) @@ -1270,7 +1270,7 @@ def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None): f0, flags = args repo.ui.note(_("moving %s to %s\n") % (f0, f)) audit(f) - repo.wwrite(f, wctx.filectx(f0).data(), flags) + wctx[f].write(wctx.filectx(f0).data(), flags) wctx[f0].remove() updated += 1 @@ -1281,7 +1281,7 @@ def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None): progress(_updating, z, item=f, total=numupdates, unit=_files) f0, flags = args repo.ui.note(_("getting %s to %s\n") % (f0, f)) - repo.wwrite(f, mctx.filectx(f0).data(), flags) + wctx[f].write(mctx.filectx(f0).data(), flags) updated += 1 # exec