[PATCH] localrepository/progress: using adding (gerund), moving units to the units field, and marking for localization

[timeless]

People might want to correct me on this one. I've done two things
here, one is changing the wording construct, the other is changing
some of the units. I suspect that I may have messed up the units.
Specifically chunk/file

# HG changeset patch
# User timeless <timeless at gmail.com>
# Date 1280722547 -10800
# Node ID c5569c8b95933c2a03024387227cee7a2dd14b11
# Parent  8071b7c9be9d0900fa231050ae23c6fb9b16cdfb
localrepository/progress: using adding (gerund), moving units to the
units field, and marking for localization

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1672,17 +1672,16 @@ class localrepository(repo.repository):
             self.ui.status(_("adding changesets\n"))
             clstart = len(cl)
             class prog(object):
-                step = _('changesets')
                 count = 1
                 ui = self.ui
                 total = None
                 def __call__(self):
-                    self.ui.progress(self.step, self.count, unit=_('chunks'),
+                    self.ui.progress(_('adding'), self.count, unit=self.step,
                                      total=self.total)
                     self.count += 1
             pr = prog()
             source.callback = pr
-
+            pr.step = _('files')
             if (cl.addgroup(source, csmap, trp) is None
                 and not emptyok):
                 raise util.Abort(_("received changelog group is empty"))
@@ -1691,7 +1690,6 @@ class localrepository(repo.repository):
             for c in xrange(clstart, clend):
                 efiles.update(self[c].files())
             efiles = len(efiles)
-            self.ui.progress(_('changesets'), None)

             # pull off the manifest group
             self.ui.status(_("adding manifests\n"))
@@ -1703,7 +1701,6 @@ class localrepository(repo.repository):
             # no new manifest will be created and the manifest group will
             # be empty during the pull
             self.manifest.addgroup(source, revmap, trp)
-            self.ui.progress(_('manifests'), None)

             needfiles = {}
             if self.ui.configbool('server', 'validate', default=False):
@@ -1717,7 +1714,7 @@ class localrepository(repo.repository):

             # process the files
             self.ui.status(_("adding file changes\n"))
-            pr.step = 'files'
+            pr.step = _('files')
             pr.count = 1
             pr.total = efiles
             source.callback = None
@@ -1742,7 +1739,7 @@ class localrepository(repo.repository):
                             needs.remove(n)
                     if not needs:
                         del needfiles[f]
-            self.ui.progress(_('files'), None)
+            self.ui.progress(_('adding'), None)

             for f, needs in needfiles.iteritems():
                 fl = self.file(f)
diff --git a/tests/test-acl.t b/tests/test-acl.t
--- a/tests/test-acl.t
+++ b/tests/test-acl.t
@@ -123,23 +123,23 @@ Extension disabled for lack of a hook
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   updating the branch cache
   rolling back to revision 0 (undo push)
@@ -199,23 +199,23 @@ Extension disabled for lack of acl.sourc
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: changes have source "push" - skipping
@@ -278,23 +278,23 @@ No [acl.allow]/[acl.deny]
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -366,23 +366,23 @@ Empty [acl.allow]
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -453,23 +453,23 @@ fred is allowed inside foo/
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -545,23 +545,23 @@ Empty [acl.deny]
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -634,23 +634,23 @@ fred is allowed inside foo/, but not foo
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -728,23 +728,23 @@ fred is allowed inside foo/, but not foo
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -819,23 +819,23 @@ fred is allowed inside foo/, but not foo
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -912,23 +912,23 @@ barney is allowed everywhere
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -1007,23 +1007,23 @@ wilma can change files with a .txt exten
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -1107,23 +1107,23 @@ file specified by acl.config does not ex
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   error: pretxnchangegroup.acl hook raised an exception: [Errno 2] No
such file or directory: '../acl.config'
@@ -1201,23 +1201,23 @@ betty is allowed inside foo/ by a acl.co
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -1307,23 +1307,23 @@ acl.config can set only [acl.allow]/[acl
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -1403,23 +1403,23 @@ fred is always allowed
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -1495,23 +1495,23 @@ no one is allowed inside foo/Bar/
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -1591,23 +1591,23 @@ OS-level groups
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled
@@ -1684,23 +1684,23 @@ OS-level groups
   bundling files: quux/file.py 9 chunks
   bundling files: quux/file.py 10 chunks
   bundling files: quux/file.py 11 chunks
-  changesets: 1 chunks
+  adding: 1 files
   add changeset ef1ea85a6374
-  changesets: 2 chunks
+  adding: 2 files
   add changeset f9cafe1212c8
-  changesets: 3 chunks
+  adding: 3 files
   add changeset 911600dab2ae
   adding manifests
-  manifests: 1/3 chunks (33.33%)
-  manifests: 2/3 chunks (66.67%)
-  manifests: 3/3 chunks (100.00%)
+  adding: 1/3 manifests (33.33%)
+  adding: 2/3 manifests (66.67%)
+  adding: 3/3 manifests (100.00%)
   adding file changes
   adding foo/Bar/file.txt revisions
-  files: 1/3 chunks (33.33%)
+  adding: 1/3 files (33.33%)
   adding foo/file.txt revisions
-  files: 2/3 chunks (66.67%)
+  adding: 2/3 files (66.67%)
   adding quux/file.py revisions
-  files: 3/3 chunks (100.00%)
+  adding: 3/3 files (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: acl.allow.branches not enabled