changeset 5848:64082dc8888a stable

evolve: use correct unit for cache building progress Also make it translatable, while we're at it.
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 14 Mar 2021 16:48:41 +0800
parents a86c2682f608
children 689b384168fd
files hgext3rd/evolve/depthcache.py hgext3rd/evolve/firstmergecache.py hgext3rd/evolve/obsdiscovery.py hgext3rd/evolve/stablesort.py
diffstat 4 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/depthcache.py	Fri Mar 12 11:05:20 2021 +0100
+++ b/hgext3rd/evolve/depthcache.py	Sun Mar 14 16:48:41 2021 +0800
@@ -117,7 +117,7 @@
         def progress(pos, rev=None):
             revstr = b'' if rev is None else (b'rev %d' % rev)
             compat.progress(repo.ui, b'updating depth cache',
-                            pos, revstr, unit=b'revision', total=total)
+                            pos, revstr, unit=_(b'changesets'), total=total)
         progress(0)
         for idx, rev in enumerate(data, 1):
             assert rev == len(self._data), (rev, len(self._data))
--- a/hgext3rd/evolve/firstmergecache.py	Fri Mar 12 11:05:20 2021 +0100
+++ b/hgext3rd/evolve/firstmergecache.py	Sun Mar 14 16:48:41 2021 +0800
@@ -11,6 +11,7 @@
 
 import array
 
+from mercurial.i18n import _
 from mercurial import (
     localrepo,
     node as nodemod,
@@ -79,7 +80,7 @@
         def progress(pos, rev=None):
             revstr = b'' if rev is None else (b'rev %d' % rev)
             compat.progress(repo.ui, b'updating firstmerge cache',
-                            pos, revstr, unit=b'revision', total=total)
+                            pos, revstr, unit=_(b'changesets'), total=total)
         progress(0)
         for idx, rev in enumerate(data, 1):
             assert rev == len(self._data), (rev, len(self._data))
--- a/hgext3rd/evolve/obsdiscovery.py	Fri Mar 12 11:05:20 2021 +0100
+++ b/hgext3rd/evolve/obsdiscovery.py	Sun Mar 14 16:48:41 2021 +0800
@@ -472,7 +472,7 @@
         def progress(pos, rev=None):
             revstr = b'' if rev is None else (b'rev %d' % rev)
             compat.progress(repo.ui, b'updating obshashrange cache',
-                            pos, revstr, unit=b'revision', total=total)
+                            pos, revstr, unit=_(b'changesets'), total=total)
         # warm the cache for the new revs
         progress(0)
         for idx, r in enumerate(revs):
--- a/hgext3rd/evolve/stablesort.py	Fri Mar 12 11:05:20 2021 +0100
+++ b/hgext3rd/evolve/stablesort.py	Sun Mar 14 16:48:41 2021 +0800
@@ -864,7 +864,7 @@
         def progress(pos, rev=None):
             revstr = b'' if rev is None else (b'rev %d' % rev)
             compat.progress(repo.ui, b'updating stablesort cache',
-                            pos, revstr, unit=b'revision', total=total)
+                            pos, revstr, unit=_(b'changesets'), total=total)
 
         progress(0)
         for idx, rev in enumerate(data):