Mercurial > hg

changeset 28471:f106913c6a4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: specify unit for ui.progress when scanning paths
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 11 Mar 2016 22:30:04 +0800
parents 80bd110dbf5e
children 70d3dc05e118
files hgext/convert/subversion.py tests/test-convert-svn-encoding.t
diffstat 2 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/subversion.py	Fri Mar 11 22:29:51 2016 +0800
+++ b/hgext/convert/subversion.py	Fri Mar 11 22:30:04 2016 +0800
@@ -749,7 +749,7 @@
 
         for i, (path, ent) in enumerate(paths):
             self.ui.progress(_('scanning paths'), i, item=path,
-                             total=len(paths))
+                             total=len(paths), unit=_('paths'))
             entrypath = self.getrelpath(path)
 
             kind = self._checkpath(entrypath, revnum)
--- a/tests/test-convert-svn-encoding.t	Fri Mar 11 22:29:51 2016 +0800
+++ b/tests/test-convert-svn-encoding.t	Fri Mar 11 22:30:04 2016 +0800
@@ -57,9 +57,9 @@
   source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2
   converting: 1/6 revisions (16.67%)
   reparent to file://*/svn-repo/trunk (glob)
-  scanning paths: /trunk/\xc3\xa0 0/3 (0.00%) (esc)
-  scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 (33.33%) (esc)
-  scanning paths: /trunk/\xc3\xa9 2/3 (66.67%) (esc)
+  scanning paths: /trunk/\xc3\xa0 0/3 paths (0.00%) (esc)
+  scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 paths (33.33%) (esc)
+  scanning paths: /trunk/\xc3\xa9 2/3 paths (66.67%) (esc)
   committing files:
   \xc3\xa0/e\xcc\x81 (esc)
   getting files: \xc3\xa0/e\xcc\x81 1/2 files (50.00%) (esc)
@@ -70,17 +70,17 @@
   3 copy files
   source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3
   converting: 2/6 revisions (33.33%)
-  scanning paths: /trunk/\xc3\xa0 0/4 (0.00%) (esc)
+  scanning paths: /trunk/\xc3\xa0 0/4 paths (0.00%) (esc)
   gone from -1
   reparent to file://*/svn-repo (glob)
   reparent to file://*/svn-repo/trunk (glob)
-  scanning paths: /trunk/\xc3\xa8 1/4 (25.00%) (esc)
+  scanning paths: /trunk/\xc3\xa8 1/4 paths (25.00%) (esc)
   copied to \xc3\xa8 from \xc3\xa9@2 (esc)
-  scanning paths: /trunk/\xc3\xa9 2/4 (50.00%) (esc)
+  scanning paths: /trunk/\xc3\xa9 2/4 paths (50.00%) (esc)
   gone from -1
   reparent to file://*/svn-repo (glob)
   reparent to file://*/svn-repo/trunk (glob)
-  scanning paths: /trunk/\xc3\xb9 3/4 (75.00%) (esc)
+  scanning paths: /trunk/\xc3\xb9 3/4 paths (75.00%) (esc)
   mark /trunk/\xc3\xb9 came from \xc3\xa0:2 (esc)
   getting files: \xc3\xa0/e\xcc\x81 1/4 files (25.00%) (esc)
   getting files: \xc3\xa9 2/4 files (50.00%) (esc)
@@ -96,11 +96,11 @@
   2 remove files
   source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4
   converting: 3/6 revisions (50.00%)
-  scanning paths: /trunk/\xc3\xa8 0/2 (0.00%) (esc)
+  scanning paths: /trunk/\xc3\xa8 0/2 paths (0.00%) (esc)
   gone from -1
   reparent to file://*/svn-repo (glob)
   reparent to file://*/svn-repo/trunk (glob)
-  scanning paths: /trunk/\xc3\xb9 1/2 (50.00%) (esc)
+  scanning paths: /trunk/\xc3\xb9 1/2 paths (50.00%) (esc)
   gone from -1
   reparent to file://*/svn-repo (glob)
   reparent to file://*/svn-repo/trunk (glob)
@@ -113,13 +113,13 @@
   source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5
   converting: 4/6 revisions (66.67%)
   reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
-  scanning paths: /branches/branch\xc3\xa9 0/1 (0.00%) (esc)
+  scanning paths: /branches/branch\xc3\xa9 0/1 paths (0.00%) (esc)
   committing changelog
   0 branch to branch?e
   source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6
   converting: 5/6 revisions (83.33%)
   reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
-  scanning paths: /branches/branch\xc3\xa9e 0/1 (0.00%) (esc)
+  scanning paths: /branches/branch\xc3\xa9e 0/1 paths (0.00%) (esc)
   committing changelog
   reparent to file://*/svn-repo (glob)
   reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)