hgext/remotefilelog/contentstore.py

--- a/hgext/remotefilelog/contentstore.py	Sun Oct 06 09:45:02 2019 -0400
+++ b/hgext/remotefilelog/contentstore.py	Sun Oct 06 09:48:39 2019 -0400
@@ -136,7 +136,7 @@
 
     def add(self, name, node, data):
         raise RuntimeError(
-            "cannot add content only to remotefilelog " "contentstore"
+            b"cannot add content only to remotefilelog " b"contentstore"
         )
 
     def getmissing(self, keys):
@@ -150,7 +150,7 @@
         if self.writestore:
             self.writestore.addremotefilelognode(name, node, data)
         else:
-            raise RuntimeError("no writable store configured")
+            raise RuntimeError(b"no writable store configured")
 
     def markledger(self, ledger, options=None):
         for store in self.stores:
@@ -208,7 +208,7 @@
 
     def add(self, name, node, data):
         raise RuntimeError(
-            "cannot add content only to remotefilelog " "contentstore"
+            b"cannot add content only to remotefilelog " b"contentstore"
         )
 
     def _sanitizemetacache(self):
@@ -255,7 +255,7 @@
         return self._shared.getmeta(name, node)
 
     def add(self, name, node, data):
-        raise RuntimeError("cannot add to a remote store")
+        raise RuntimeError(b"cannot add to a remote store")
 
     def getmissing(self, keys):
         return keys
@@ -269,7 +269,7 @@
         self._store = repo.store
         self._svfs = repo.svfs
         self._revlogs = dict()
-        self._cl = revlog.revlog(self._svfs, '00changelog.i')
+        self._cl = revlog.revlog(self._svfs, b'00changelog.i')
         self._repackstartlinkrev = 0
 
     def get(self, name, node):
@@ -311,7 +311,7 @@
                 missing.add(p2)
 
             linknode = self._cl.node(rl.linkrev(ancrev))
-            ancestors[rl.node(ancrev)] = (p1, p2, linknode, '')
+            ancestors[rl.node(ancrev)] = (p1, p2, linknode, b'')
             if not missing:
                 break
         return ancestors
@@ -324,14 +324,14 @@
         return (parents[0], parents[1], cl.node(linkrev), None)
 
     def add(self, *args):
-        raise RuntimeError("cannot add to a revlog store")
+        raise RuntimeError(b"cannot add to a revlog store")
 
     def _revlog(self, name):
         rl = self._revlogs.get(name)
         if rl is None:
-            revlogname = '00manifesttree.i'
-            if name != '':
-                revlogname = 'meta/%s/00manifest.i' % name
+            revlogname = b'00manifesttree.i'
+            if name != b'':
+                revlogname = b'meta/%s/00manifest.i' % name
             rl = revlog.revlog(self._svfs, revlogname)
             self._revlogs[name] = rl
         return rl
@@ -352,8 +352,8 @@
     def markledger(self, ledger, options=None):
         if options and options.get(constants.OPTION_PACKSONLY):
             return
-        treename = ''
-        rl = revlog.revlog(self._svfs, '00manifesttree.i')
+        treename = b''
+        rl = revlog.revlog(self._svfs, b'00manifesttree.i')
         startlinkrev = self._repackstartlinkrev
         endlinkrev = self._repackendlinkrev
         for rev in pycompat.xrange(len(rl) - 1, -1, -1):
@@ -367,10 +367,10 @@
             ledger.markhistoryentry(self, treename, node)
 
         for path, encoded, size in self._store.datafiles():
-            if path[:5] != 'meta/' or path[-2:] != '.i':
+            if path[:5] != b'meta/' or path[-2:] != b'.i':
                 continue
 
-            treename = path[5 : -len('/00manifest.i')]
+            treename = path[5 : -len(b'/00manifest.i')]
 
             rl = revlog.revlog(self._svfs, path)
             for rev in pycompat.xrange(len(rl) - 1, -1, -1):