diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py --- a/hgext/convert/convcmd.py +++ b/hgext/convert/convcmd.py @@ -81,7 +81,7 @@ class progresssource(object): def getfile(self, file, rev): self.retrieved += 1 - self.ui.progress(_('retrieving file'), self.retrieved, + self.ui.progress(_('getting files'), self.retrieved, item=file, total=self.filecount) return self.source.getfile(file, rev) @@ -89,7 +89,7 @@ class progresssource(object): return self.source.lookuprev(rev) def close(self): - self.ui.progress(_('retrieving file'), None) + self.ui.progress(_('getting files'), None) class converter(object): def __init__(self, ui, source, dest, revmapfile, opts): diff --git a/tests/test-convert-svn-move.out b/tests/test-convert-svn-move.out --- a/tests/test-convert-svn-move.out +++ b/tests/test-convert-svn-move.out @@ -88,30 +88,30 @@ scanning [ <=> scanning [ <=> ] 4 converting [ ] 0/4 -retrieving file [==========> ] 1/5 -retrieving file [=====================> ] 2/5 -retrieving file [=================================> ] 3/5 -retrieving file [============================================> ] 4/5 -retrieving file [========================================================>] 5/5 +getting files [==========> ] 1/5 +getting files [======================> ] 2/5 +getting files [==================================> ] 3/5 +getting files [==============================================> ] 4/5 +getting files [==========================================================>] 5/5 converting [==============> ] 1/4 scanning paths [ ] 0/1 -retrieving file [========================================================>] 1/1 +getting files [==========================================================>] 1/1 converting [==============================> ] 2/4 scanning paths [ ] 0/2 scanning paths [============================> ] 1/2 -retrieving file [=============> ] 1/4 -retrieving file [===========================> ] 2/4 -retrieving file [=========================================> ] 3/4 -retrieving file [========================================================>] 4/4 +getting files [=============> ] 1/4 +getting files [============================> ] 2/4 +getting files [===========================================> ] 3/4 +getting files [==========================================================>] 4/4 converting [=============================================> ] 3/4 scanning paths [ ] 0/1 -retrieving file [========================================================>] 1/1 +getting files [==========================================================>] 1/1 initializing destination hg-progress repository scanning source...