--- a/hgext/rebase.py Sat Oct 16 18:09:01 2010 +0200
+++ b/hgext/rebase.py Tue Jul 20 20:53:48 2010 +0200
@@ -155,7 +155,7 @@
pos += 1
if state[rev] == -1:
ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])),
- _(' changesets'), total)
+ _('changesets'), total)
storestatus(repo, originalwd, target, state, collapsef, keepf,
keepbranchesf, external)
p1, p2 = defineparents(repo, rev, target, state,
--- a/hgext/relink.py Sat Oct 16 18:09:01 2010 +0200
+++ b/hgext/relink.py Tue Jul 20 20:53:48 2010 +0200
@@ -117,7 +117,7 @@
ui.debug(_('not linkable: %s\n') % fn)
continue
targets.append((fn, ts.st_size))
- ui.progress(_('pruning'), pos, fn, _(' files'), total)
+ ui.progress(_('pruning'), pos, fn, _('files'), total)
ui.progress(_('pruning'), None)
ui.status(_('pruned down to %d probably relinkable files\n') % len(targets))
@@ -160,7 +160,7 @@
continue
try:
relinkfile(source, tgt)
- ui.progress(_('relinking'), pos, f, _(' files'), total)
+ ui.progress(_('relinking'), pos, f, _('files'), total)
relinked += 1
savedbytes += sz
except OSError, inst:
--- a/tests/test-relink.t Sat Oct 16 18:09:01 2010 +0200
+++ b/tests/test-relink.t Tue Jul 20 20:53:48 2010 +0200
@@ -70,11 +70,11 @@
collected 5 candidate storage files
not linkable: 00changelog.i
not linkable: 00manifest.i
- pruning: data/a.i 3/5 files (60.00%)
+ pruning: data/a.i 3/5 files (60.00%)
not linkable: data/b.i
- pruning: data/dummy.i 5/5 files (100.00%)
+ pruning: data/dummy.i 5/5 files (100.00%)
pruned down to 2 probably relinkable files
- relinking: data/a.i 1/2 files (50.00%)
+ relinking: data/a.i 1/2 files (50.00%)
not linkable: data/dummy.i
relinked 1 files (136 bytes reclaimed)
$ cd ..