Show More
@@ -495,7 +495,7 b' class mergestate(object):' | |||||
495 | self._repo.wwrite(dfile, f.read(), flags) |
|
495 | self._repo.wwrite(dfile, f.read(), flags) | |
496 | f.close() |
|
496 | f.close() | |
497 | else: |
|
497 | else: | |
498 |
|
|
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, | |
501 | labels=self._labels) |
|
501 | labels=self._labels) | |
@@ -1084,7 +1084,6 b' def batchremove(repo, wctx, actions):' | |||||
1084 | yields tuples for progress updates |
|
1084 | yields tuples for progress updates | |
1085 | """ |
|
1085 | """ | |
1086 | verbose = repo.ui.verbose |
|
1086 | verbose = repo.ui.verbose | |
1087 | unlinkpath = repo.wvfs.unlinkpath |
|
|||
1088 | audit = repo.wvfs.audit |
|
1087 | audit = repo.wvfs.audit | |
1089 | try: |
|
1088 | try: | |
1090 | cwd = pycompat.getcwd() |
|
1089 | cwd = pycompat.getcwd() | |
@@ -1099,7 +1098,7 b' def batchremove(repo, wctx, actions):' | |||||
1099 | repo.ui.note(_("removing %s\n") % f) |
|
1098 | repo.ui.note(_("removing %s\n") % f) | |
1100 | audit(f) |
|
1099 | audit(f) | |
1101 | try: |
|
1100 | try: | |
1102 |
|
|
1101 | wctx[f].remove(ignoremissing=True) | |
1103 | except OSError as inst: |
|
1102 | except OSError as inst: | |
1104 | repo.ui.warn(_("update failed to remove %s: %s!\n") % |
|
1103 | repo.ui.warn(_("update failed to remove %s: %s!\n") % | |
1105 | (f, inst.strerror)) |
|
1104 | (f, inst.strerror)) | |
@@ -1213,7 +1212,7 b' def applyupdates(repo, actions, wctx, mc' | |||||
1213 | if os.path.lexists(repo.wjoin(f)): |
|
1212 | if os.path.lexists(repo.wjoin(f)): | |
1214 | repo.ui.debug("removing %s\n" % f) |
|
1213 | repo.ui.debug("removing %s\n" % f) | |
1215 | audit(f) |
|
1214 | audit(f) | |
1216 | repo.wvfs.unlinkpath(f) |
|
1215 | wctx[f].remove() | |
1217 |
|
1216 | |||
1218 | numupdates = sum(len(l) for m, l in actions.items() if m != 'k') |
|
1217 | numupdates = sum(len(l) for m, l in actions.items() if m != 'k') | |
1219 |
|
1218 | |||
@@ -1272,7 +1271,7 b' def applyupdates(repo, actions, wctx, mc' | |||||
1272 | repo.ui.note(_("moving %s to %s\n") % (f0, f)) |
|
1271 | repo.ui.note(_("moving %s to %s\n") % (f0, f)) | |
1273 | audit(f) |
|
1272 | audit(f) | |
1274 | repo.wwrite(f, wctx.filectx(f0).data(), flags) |
|
1273 | repo.wwrite(f, wctx.filectx(f0).data(), flags) | |
1275 | repo.wvfs.unlinkpath(f0) |
|
1274 | wctx[f0].remove() | |
1276 | updated += 1 |
|
1275 | updated += 1 | |
1277 |
|
1276 | |||
1278 | # local directory rename, get |
|
1277 | # local directory rename, get |
General Comments 0
You need to be logged in to leave comments.
Login now