Mercurial > hg-stable
diff mercurial/copies.py @ 9467:4c041f1ee1b4
do not attempt to translate ui.debug output
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 19 Sep 2009 01:15:38 +0200 |
parents | bbc78cb1bf15 |
children | 83cfa1baf8ad |
line wrap: on
line diff
--- a/mercurial/copies.py Fri Sep 18 17:37:51 2009 +0200 +++ b/mercurial/copies.py Sat Sep 19 01:15:38 2009 +0200 @@ -144,16 +144,16 @@ elif of in ma: diverge.setdefault(of, []).append(f) - repo.ui.debug(_(" searching for copies back to rev %d\n") % limit) + repo.ui.debug(" searching for copies back to rev %d\n" % limit) u1 = _nonoverlap(m1, m2, ma) u2 = _nonoverlap(m2, m1, ma) if u1: - repo.ui.debug(_(" unmatched files in local:\n %s\n") + repo.ui.debug(" unmatched files in local:\n %s\n" % "\n ".join(u1)) if u2: - repo.ui.debug(_(" unmatched files in other:\n %s\n") + repo.ui.debug(" unmatched files in other:\n %s\n" % "\n ".join(u2)) for f in u1: @@ -169,7 +169,7 @@ diverge2.update(fl) # reverse map for below if fullcopy: - repo.ui.debug(_(" all copies found (* = to merge, ! = divergent):\n")) + repo.ui.debug(" all copies found (* = to merge, ! = divergent):\n") for f in fullcopy: note = "" if f in copy: note += "*" @@ -180,7 +180,7 @@ if not fullcopy or not checkdirs: return copy, diverge - repo.ui.debug(_(" checking for directory renames\n")) + repo.ui.debug(" checking for directory renames\n") # generate a directory move map d1, d2 = _dirs(m1), _dirs(m2) @@ -216,7 +216,7 @@ return copy, diverge for d in dirmove: - repo.ui.debug(_(" dir %s -> %s\n") % (d, dirmove[d])) + repo.ui.debug(" dir %s -> %s\n" % (d, dirmove[d])) # check unaccounted nonoverlapping files against directory moves for f in u1 + u2: @@ -227,7 +227,7 @@ df = dirmove[d] + f[len(d):] if df not in copy: copy[f] = df - repo.ui.debug(_(" file %s -> %s\n") % (f, copy[f])) + repo.ui.debug(" file %s -> %s\n" % (f, copy[f])) break return copy, diverge