Mercurial > hg
comparison hgext/absorb.py @ 38921:e930df0f9a55
absorb: use ui.debug() instead of open-coding it
Differential Revision: https://phab.mercurial-scm.org/D4046
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 01 Aug 2018 18:29:57 -0400 |
| parents | a5c8c5476339 |
| children | ec0697f4f9c9 |
comparison
equal
deleted
inserted
replaced
| 38920:a5c8c5476339 | 38921:e930df0f9a55 |
|---|---|
| 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 |