equal
deleted
inserted
replaced
652 merged += 1 |
652 merged += 1 |
653 elif m == "d": # directory rename |
653 elif m == "d": # directory rename |
654 f2, fd, flags = args |
654 f2, fd, flags = args |
655 if f: |
655 if f: |
656 repo.ui.note(_("moving %s to %s\n") % (f, fd)) |
656 repo.ui.note(_("moving %s to %s\n") % (f, fd)) |
657 audit(f) |
657 audit(fd) |
658 repo.wwrite(fd, wctx.filectx(f).data(), flags) |
658 repo.wwrite(fd, wctx.filectx(f).data(), flags) |
659 util.unlinkpath(repo.wjoin(f)) |
659 util.unlinkpath(repo.wjoin(f)) |
660 if f2: |
660 if f2: |
661 repo.ui.note(_("getting %s to %s\n") % (f2, fd)) |
661 repo.ui.note(_("getting %s to %s\n") % (f2, fd)) |
662 repo.wwrite(fd, mctx.filectx(f2).data(), flags) |
662 repo.wwrite(fd, mctx.filectx(f2).data(), flags) |