# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1547654584 18000
# Node ID 194e43c2bac9c0d3b68898dc72a9d20e2b281ac5
# Parent  a6b98c95bcf0f26becf956b127abed26655cf479
remotefilelog: fix some bytes/str portability issues for Python 3

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

Differential Revision: https://phab.mercurial-scm.org/D5609

diff -r a6b98c95bcf0 -r 194e43c2bac9 hgext/remotefilelog/basestore.py
--- a/hgext/remotefilelog/basestore.py	Wed Jan 16 11:02:20 2019 -0500
+++ b/hgext/remotefilelog/basestore.py	Wed Jan 16 11:03:04 2019 -0500
@@ -383,7 +383,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))
diff -r a6b98c95bcf0 -r 194e43c2bac9 hgext/remotefilelog/debugcommands.py
--- a/hgext/remotefilelog/debugcommands.py	Wed Jan 16 11:02:20 2019 -0500
+++ b/hgext/remotefilelog/debugcommands.py	Wed Jan 16 11:03:04 2019 -0500
@@ -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()),