hgext3rd/evolve/legacy.py
changeset 4814 48b30ff742cb
parent 4808 14c12df16ab5
--- a/hgext3rd/evolve/legacy.py	Tue Aug 06 15:06:27 2019 +0200
+++ b/hgext3rd/evolve/legacy.py	Tue Aug 06 15:06:38 2019 +0200
@@ -45,20 +45,20 @@
     """
     if not repo.local():
         return
-    evolveopts = ui.configlist('experimental', 'evolution')
+    evolveopts = ui.configlist(b'experimental', b'evolution')
     if not evolveopts:
-        evolveopts = 'all'
-        ui.setconfig('experimental', 'evolution', evolveopts)
+        evolveopts = b'all'
+        ui.setconfig(b'experimental', b'evolution', evolveopts)
     for arg in sys.argv:
         if r'debugc' in arg:
             break
     else:
-        data = repo.vfs.tryread('obsolete-relations')
+        data = repo.vfs.tryread(b'obsolete-relations')
         if not data:
-            data = repo.svfs.tryread('obsoletemarkers')
+            data = repo.svfs.tryread(b'obsoletemarkers')
         if data:
-            raise error.Abort('old format of obsolete marker detected!\n'
-                              'run `hg debugconvertobsolete` once.')
+            raise error.Abort(b'old format of obsolete marker detected!\n'
+                              b'run `hg debugconvertobsolete` once.')
 
 def _obsdeserialize(flike):
     """read a file like object serialized with _obsserialize
@@ -77,7 +77,7 @@
 
 cmdtable = {}
 command = commandfunc(cmdtable)
-@command('debugconvertobsolete', [], '')
+@command(b'debugconvertobsolete', [], b'')
 def cmddebugconvertobsolete(ui, repo):
     """import markers from an .hg/obsolete-relations file"""
     cnt = 0
@@ -86,13 +86,13 @@
     some = False
     try:
         unlink = []
-        tr = repo.transaction('convert-obsolete')
+        tr = repo.transaction(b'convert-obsolete')
         try:
             repo._importoldobsolete = True
             store = repo.obsstore
             ### very first format
             try:
-                f = repo.vfs('obsolete-relations')
+                f = repo.vfs(b'obsolete-relations')
                 try:
                     some = True
                     for line in f:
@@ -101,23 +101,23 @@
                         prec = bin(objhex)
                         sucs = (suc == nullid) and [] or [suc]
                         meta = {
-                            'date': '%i %i' % makedate(),
-                            'user': ui.username(),
+                            b'date': b'%i %i' % makedate(),
+                            b'user': ui.username(),
                             }
                         try:
                             store.create(tr, prec, sucs, 0, metadata=meta)
                             cnt += 1
                         except ValueError:
-                            repo.ui.write_err("invalid old marker line: %s"
+                            repo.ui.write_err(b"invalid old marker line: %s"
                                               % (line))
                             err += 1
                 finally:
                     f.close()
-                unlink.append(repo.vfs.join('obsolete-relations'))
+                unlink.append(repo.vfs.join(b'obsolete-relations'))
             except IOError:
                 pass
             ### second (json) format
-            data = repo.svfs.tryread('obsoletemarkers')
+            data = repo.svfs.tryread(b'obsoletemarkers')
             if data:
                 some = True
                 for oldmark in json.loads(data):
@@ -147,11 +147,11 @@
                                      0, metadata=meta)
                         cnt += 1
                     except ValueError:
-                        msg = "invalid marker %s -> %s\n"
+                        msg = b"invalid marker %s -> %s\n"
                         msg %= (oldobject, oldsubjects)
                         repo.ui.write_err(msg)
                         err += 1
-                unlink.append(repo.svfs.join('obsoletemarkers'))
+                unlink.append(repo.svfs.join(b'obsoletemarkers'))
             tr.close()
             for path in unlink:
                 util.unlink(path)
@@ -161,12 +161,12 @@
         del repo._importoldobsolete
         lock.release()
     if not some:
-        ui.warn(_('nothing to do\n'))
-    ui.status('%i obsolete marker converted\n' % cnt)
+        ui.warn(_(b'nothing to do\n'))
+    ui.status(b'%i obsolete marker converted\n' % cnt)
     if err:
-        ui.write_err('%i conversion failed. check you graph!\n' % err)
+        ui.write_err(b'%i conversion failed. check you graph!\n' % err)
 
-@command('debugrecordpruneparents', [], '')
+@command(b'debugrecordpruneparents', [], b'')
 def cmddebugrecordpruneparents(ui, repo):
     """add parent data to prune markers when possible
 
@@ -174,14 +174,14 @@
     If the pruned node is locally known, it creates a new marker with parent
     data.
     """
-    pgop = 'reading markers'
+    pgop = b'reading markers'
 
     # lock from the beginning to prevent race
     wlock = lock = tr = None
     try:
         wlock = repo.wlock()
         lock = repo.lock()
-        tr = repo.transaction('recordpruneparents')
+        tr = repo.transaction(b'recordpruneparents')
         unfi = repo.unfiltered()
         nm = unfi.changelog.nodemap
         store = repo.obsstore
@@ -196,7 +196,7 @@
                     store.create(tr, prec=mark[0], succs=mark[1], flag=mark[2],
                                  metadata=dict(mark[3]), parents=parents)
                     if len(store._all) - before:
-                        ui.write(_('created new markers for %i\n') % rev)
+                        ui.write(_(b'created new markers for %i\n') % rev)
             ui.progress(pgop, idx, total=pgtotal)
         tr.close()
         ui.progress(pgop, None)