[PATCH] progress: dropping superfluous space from units

timeless timeless at gmail.com
Thu Oct 14 03:04:32 CDT 2010


This is a really old change, I'm sorry I hadn't sent it ages ago.

# HG changeset patch
# User timeless <timeless at gmail.com>
# Date 1279652028 -7200
# Node ID 7efaa941b8ca005d20be00d1c21c9bb21c2d0df4
# Parent  6162b11b16aa304a106b713fb5b83d666a90843f
progress: dropping superfluous space from units

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -155,7 +155,7 @@ def rebase(ui, repo, **opts):
             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,
diff --git a/hgext/relink.py b/hgext/relink.py
--- a/hgext/relink.py
+++ b/hgext/relink.py
@@ -117,7 +117,7 @@ def prune(candidates, src, dst, ui):
             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 @@ def do_relink(src, dst, files, ui):
             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:
diff --git a/tests/test-relink.t b/tests/test-relink.t
--- a/tests/test-relink.t
+++ b/tests/test-relink.t
@@ -70,11 +70,11 @@ relink
   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 ..


More information about the Mercurial-devel mailing list