Mercurial > public > mercurial-scm > hg-stable
diff hgext/convert/cvsps.py @ 37087:f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
This might conflict with other patches floating around, sorry.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 22 Mar 2018 21:56:20 +0900 |
| parents | c6061cadb400 |
| children | a8a902d7176e |
line wrap: on
line diff
--- a/hgext/convert/cvsps.py Thu Mar 22 21:19:31 2018 +0900 +++ b/hgext/convert/cvsps.py Thu Mar 22 21:56:20 2018 +0900 @@ -17,7 +17,10 @@ pycompat, util, ) -from mercurial.utils import dateutil +from mercurial.utils import ( + dateutil, + stringutil, +) pickle = util.pickle @@ -452,7 +455,8 @@ rcsmap[e.rcs.replace('/Attic/', '/')] = e.rcs if len(log) % 100 == 0: - ui.status(util.ellipsis('%d %s' % (len(log), e.file), 80)+'\n') + ui.status(stringutil.ellipsis('%d %s' % (len(log), e.file), 80) + + '\n') log.sort(key=lambda x: (x.rcs, x.revision)) @@ -608,7 +612,7 @@ files = set() if len(changesets) % 100 == 0: t = '%d %s' % (len(changesets), repr(e.comment)[1:-1]) - ui.status(util.ellipsis(t, 80) + '\n') + ui.status(stringutil.ellipsis(t, 80) + '\n') c.entries.append(e) files.add(e.file)