Mercurial > hg
comparison mercurial/merge.py @ 33083: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 |
comparison
equal
deleted
inserted
replaced
| 33082:f9e50ee4c52b | 33083:05c680ebf512 |
|---|---|
| 490 flags = flo | 490 flags = flo |
| 491 if preresolve: | 491 if preresolve: |
| 492 # restore local | 492 # restore local |
| 493 if hash != nullhex: | 493 if hash != nullhex: |
| 494 f = self._repo.vfs('merge/' + hash) | 494 f = self._repo.vfs('merge/' + hash) |
| 495 self._repo.wwrite(dfile, f.read(), flags) | 495 wctx[dfile].write(f.read(), flags) |
| 496 f.close() | 496 f.close() |
| 497 else: | 497 else: |
| 498 wctx[dfile].remove(ignoremissing=True) | 498 wctx[dfile].remove(ignoremissing=True) |
| 499 complete, r, deleted = filemerge.premerge(self._repo, self._local, | 499 complete, r, deleted = filemerge.premerge(self._repo, self._local, |
| 500 lfile, fcd, fco, fca, | 500 lfile, fcd, fco, fca, |
| 1268 z += 1 | 1268 z += 1 |
| 1269 progress(_updating, z, item=f, total=numupdates, unit=_files) | 1269 progress(_updating, z, item=f, total=numupdates, unit=_files) |
| 1270 f0, flags = args | 1270 f0, flags = args |
| 1271 repo.ui.note(_("moving %s to %s\n") % (f0, f)) | 1271 repo.ui.note(_("moving %s to %s\n") % (f0, f)) |
| 1272 audit(f) | 1272 audit(f) |
| 1273 repo.wwrite(f, wctx.filectx(f0).data(), flags) | 1273 wctx[f].write(wctx.filectx(f0).data(), flags) |
| 1274 wctx[f0].remove() | 1274 wctx[f0].remove() |
| 1275 updated += 1 | 1275 updated += 1 |
| 1276 | 1276 |
| 1277 # local directory rename, get | 1277 # local directory rename, get |
| 1278 for f, args, msg in actions['dg']: | 1278 for f, args, msg in actions['dg']: |
| 1279 repo.ui.debug(" %s: %s -> dg\n" % (f, msg)) | 1279 repo.ui.debug(" %s: %s -> dg\n" % (f, msg)) |
| 1280 z += 1 | 1280 z += 1 |
| 1281 progress(_updating, z, item=f, total=numupdates, unit=_files) | 1281 progress(_updating, z, item=f, total=numupdates, unit=_files) |
| 1282 f0, flags = args | 1282 f0, flags = args |
| 1283 repo.ui.note(_("getting %s to %s\n") % (f0, f)) | 1283 repo.ui.note(_("getting %s to %s\n") % (f0, f)) |
| 1284 repo.wwrite(f, mctx.filectx(f0).data(), flags) | 1284 wctx[f].write(mctx.filectx(f0).data(), flags) |
| 1285 updated += 1 | 1285 updated += 1 |
| 1286 | 1286 |
| 1287 # exec | 1287 # exec |
| 1288 for f, args, msg in actions['e']: | 1288 for f, args, msg in actions['e']: |
| 1289 repo.ui.debug(" %s: %s -> e\n" % (f, msg)) | 1289 repo.ui.debug(" %s: %s -> e\n" % (f, msg)) |