equal
deleted
inserted
replaced
620 # prepare the filefixupstate |
620 # prepare the filefixupstate |
621 seenfctxs = set() |
621 seenfctxs = set() |
622 # sorting is necessary to eliminate ambiguity for the "double move" |
622 # sorting is necessary to eliminate ambiguity for the "double move" |
623 # case: "hg cp A B; hg cp A C; hg rm A", then only "B" can affect "A". |
623 # case: "hg cp A B; hg cp A C; hg rm A", then only "B" can affect "A". |
624 for path in sorted(interestingpaths): |
624 for path in sorted(interestingpaths): |
625 if self.ui.debugflag: |
625 self.ui.debug('calculating fixups for %s\n' % path) |
626 self.ui.write(_('calculating fixups for %s\n') % path) |
|
627 targetfctx = targetctx[path] |
626 targetfctx = targetctx[path] |
628 fctxs, ctx2fctx = getfilestack(self.stack, path, seenfctxs) |
627 fctxs, ctx2fctx = getfilestack(self.stack, path, seenfctxs) |
629 # ignore symbolic links or binary, or unchanged files |
628 # ignore symbolic links or binary, or unchanged files |
630 if any(f.islink() or stringutil.binary(f.data()) |
629 if any(f.islink() or stringutil.binary(f.data()) |
631 for f in [targetfctx] + fctxs |
630 for f in [targetfctx] + fctxs |