hgext3rd/evolve/depthcache.py
changeset 4814 48b30ff742cb
parent 4806 44629ae21b84
child 5137 4fef6b157175
--- a/hgext3rd/evolve/depthcache.py	Tue Aug 06 15:06:27 2019 +0200
+++ b/hgext3rd/evolve/depthcache.py	Tue Aug 06 15:06:38 2019 +0200
@@ -32,7 +32,7 @@
 
 def simpledepth(repo, rev):
     """simple but obviously right implementation of depth"""
-    return len(repo.revs('::%d', rev))
+    return len(repo.revs(b'::%d', rev))
 
 @eh.command(
     b'debugdepth',
@@ -46,25 +46,25 @@
     """
     revs = scmutil.revrange(repo, opts['rev'])
     method = opts['method']
-    if method in ('cached', 'compare'):
+    if method in (b'cached', b'compare'):
         cache = repo.depthcache
         cache.save(repo)
     for r in revs:
         ctx = repo[r]
-        if method == 'simple':
+        if method == b'simple':
             depth = simpledepth(repo, r)
-        elif method == 'cached':
+        elif method == b'cached':
             depth = cache.get(r)
-        elif method == 'compare':
+        elif method == b'compare':
             simple = simpledepth(repo, r)
             cached = cache.get(r)
             if simple != cached:
-                raise error.Abort('depth differ for revision %s: %d != %d'
+                raise error.Abort(b'depth differ for revision %s: %d != %d'
                                   % (ctx, simple, cached))
             depth = simple
         else:
-            raise error.Abort('unknown method "%s"' % method)
-        ui.write('%s %d\n' % (ctx, depth))
+            raise error.Abort(b'unknown method "%s"' % method)
+        ui.write(b'%s %d\n' % (ctx, depth))
 
 @eh.reposetup
 def setupcache(ui, repo):
@@ -94,8 +94,8 @@
 
 class depthcache(genericcaches.changelogsourcebase):
 
-    _filepath = 'evoext-depthcache-00'
-    _cachename = 'evo-ext-depthcache'
+    _filepath = b'evoext-depthcache-00'
+    _cachename = b'evo-ext-depthcache'
 
     def __init__(self):
         super(depthcache, self).__init__()
@@ -103,7 +103,7 @@
 
     def get(self, rev):
         if len(self._data) <= rev:
-            raise error.ProgrammingError('depthcache must be warmed before use')
+            raise error.ProgrammingError(b'depthcache must be warmed before use')
         return self._data[rev]
 
     def _updatefrom(self, repo, data):
@@ -113,9 +113,9 @@
         total = len(data)
 
         def progress(pos, rev=None):
-            revstr = '' if rev is None else ('rev %d' % rev)
-            compat.progress(repo.ui, 'updating depth cache',
-                            pos, revstr, unit='revision', total=total)
+            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)
         progress(0)
         for idx, rev in enumerate(data, 1):
             assert rev == len(self._data), (rev, len(self._data))
@@ -199,12 +199,12 @@
             return
 
         try:
-            cachefile = repo.cachevfs(self._filepath, 'w', atomictemp=True)
+            cachefile = repo.cachevfs(self._filepath, b'w', atomictemp=True)
             headerdata = self._serializecachekey()
             cachefile.write(headerdata)
             cachefile.write(compat.arraytobytes(self._data))
             cachefile.close()
             self._ondiskkey = self._cachekey
         except (IOError, OSError) as exc:
-            repo.ui.log('depthcache', 'could not write update %s\n' % exc)
-            repo.ui.debug('depthcache: could not write update %s\n' % exc)
+            repo.ui.log(b'depthcache', b'could not write update %s\n' % exc)
+            repo.ui.debug(b'depthcache: could not write update %s\n' % exc)