Mercurial > hg > mercurial-source
changeset 33866:05c680ebf512
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.
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Sun, 25 Jun 2017 17:00:15 -0700 |
parents | f9e50ee4c52b |
children | 873f638fd7db |
files | mercurial/merge.py |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -492,7 +492,7 @@ # 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 @@ 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 @@ 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