equal
deleted
inserted
replaced
1188 # remove renamed files after safely stored |
1188 # remove renamed files after safely stored |
1189 for f in moves: |
1189 for f in moves: |
1190 if os.path.lexists(repo.wjoin(f)): |
1190 if os.path.lexists(repo.wjoin(f)): |
1191 repo.ui.debug("removing %s\n" % f) |
1191 repo.ui.debug("removing %s\n" % f) |
1192 audit(f) |
1192 audit(f) |
1193 util.unlinkpath(repo.wjoin(f)) |
1193 repo.wvfs.unlinkpath(f) |
1194 |
1194 |
1195 numupdates = sum(len(l) for m, l in actions.items() if m != 'k') |
1195 numupdates = sum(len(l) for m, l in actions.items() if m != 'k') |
1196 |
1196 |
1197 if [a for a in actions['r'] if a[0] == '.hgsubstate']: |
1197 if [a for a in actions['r'] if a[0] == '.hgsubstate']: |
1198 subrepo.submerge(repo, wctx, mctx, wctx, overwrite, labels) |
1198 subrepo.submerge(repo, wctx, mctx, wctx, overwrite, labels) |
1245 progress(_updating, z, item=f, total=numupdates, unit=_files) |
1245 progress(_updating, z, item=f, total=numupdates, unit=_files) |
1246 f0, flags = args |
1246 f0, flags = args |
1247 repo.ui.note(_("moving %s to %s\n") % (f0, f)) |
1247 repo.ui.note(_("moving %s to %s\n") % (f0, f)) |
1248 audit(f) |
1248 audit(f) |
1249 repo.wwrite(f, wctx.filectx(f0).data(), flags) |
1249 repo.wwrite(f, wctx.filectx(f0).data(), flags) |
1250 util.unlinkpath(repo.wjoin(f0)) |
1250 repo.wvfs.unlinkpath(f0) |
1251 updated += 1 |
1251 updated += 1 |
1252 |
1252 |
1253 # local directory rename, get |
1253 # local directory rename, get |
1254 for f, args, msg in actions['dg']: |
1254 for f, args, msg in actions['dg']: |
1255 repo.ui.debug(" %s: %s -> dg\n" % (f, msg)) |
1255 repo.ui.debug(" %s: %s -> dg\n" % (f, msg)) |