D5609: remotefilelog: fix some bytes/str portability issues for Python 3

[durin42 (Augie Fackler)]

durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  A few remotefilelog tests still fail on Python 3, but it's a much better story
  now.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5609

AFFECTED FILES
  hgext/remotefilelog/basestore.py
  hgext/remotefilelog/debugcommands.py

CHANGE DETAILS

diff --git a/hgext/remotefilelog/debugcommands.py b/hgext/remotefilelog/debugcommands.py
--- a/hgext/remotefilelog/debugcommands.py
+++ b/hgext/remotefilelog/debugcommands.py
@@ -242,8 +242,8 @@
 
             ui.write(("Total:%s%s  %s (%s)\n") % (
                 "".ljust(2 * hashlen - len("Total:")),
-                str(totaldeltasize).ljust(12),
-                str(totalblobsize).ljust(9),
+                ('%d' % totaldeltasize).ljust(12),
+                ('%d' % totalblobsize).ljust(9),
                 deltastr
             ))
 
@@ -277,10 +277,10 @@
                 totalblobsize += blobsize
             else:
                 blobsize = "(missing)"
-            ui.write("%s  %s  %s%s\n" % (
+            ui.write("%s  %s  %s%d\n" % (
                 hashformatter(node),
                 hashformatter(deltabase),
-                str(deltalen).ljust(14),
+                ('%d' % deltalen).ljust(14),
                 blobsize))
 
         if filename is not None:
@@ -342,7 +342,7 @@
             "Delta Length".ljust(6),
         ))
 
-        ui.write("%s  %s  %s  %s\n" % (
+        ui.write("%s  %s  %s  %d\n" % (
             hashformatter(node),
             hashformatter(deltabasenode),
             nodemod.hex(hashlib.sha1(delta).digest()),
diff --git a/hgext/remotefilelog/basestore.py b/hgext/remotefilelog/basestore.py
--- a/hgext/remotefilelog/basestore.py
+++ b/hgext/remotefilelog/basestore.py
@@ -386,7 +386,7 @@
                 removedexcess += oldpathstat.st_size
             progress.complete()
 
-        ui.status(_("finished: removed %s of %s files (%0.2f GB to %0.2f GB)\n")
+        ui.status(_("finished: removed %d of %d files (%0.2f GB to %0.2f GB)\n")
                   % (removed, count,
                      float(originalsize) / 1024.0 / 1024.0 / 1024.0,
                      float(size) / 1024.0 / 1024.0 / 1024.0))



To: durin42, #hg-reviewers
Cc: mercurial-devel