##// END OF EJS Templates
remotefilelog: fix some bytes/str portability issues for Python 3...
Augie Fackler -
r41295:194e43c2 default
parent child Browse files
Show More
@@ -383,7 +383,7 b' class basestore(object):'
383 removedexcess += oldpathstat.st_size
383 removedexcess += oldpathstat.st_size
384 progress.complete()
384 progress.complete()
385
385
386 ui.status(_("finished: removed %s of %s files (%0.2f GB to %0.2f GB)\n")
386 ui.status(_("finished: removed %d of %d files (%0.2f GB to %0.2f GB)\n")
387 % (removed, count,
387 % (removed, count,
388 float(originalsize) / 1024.0 / 1024.0 / 1024.0,
388 float(originalsize) / 1024.0 / 1024.0 / 1024.0,
389 float(size) / 1024.0 / 1024.0 / 1024.0))
389 float(size) / 1024.0 / 1024.0 / 1024.0))
@@ -242,8 +242,8 b' def debugdatapack(ui, *paths, **opts):'
242
242
243 ui.write(("Total:%s%s %s (%s)\n") % (
243 ui.write(("Total:%s%s %s (%s)\n") % (
244 "".ljust(2 * hashlen - len("Total:")),
244 "".ljust(2 * hashlen - len("Total:")),
245 str(totaldeltasize).ljust(12),
245 ('%d' % totaldeltasize).ljust(12),
246 str(totalblobsize).ljust(9),
246 ('%d' % totalblobsize).ljust(9),
247 deltastr
247 deltastr
248 ))
248 ))
249
249
@@ -277,10 +277,10 b' def debugdatapack(ui, *paths, **opts):'
277 totalblobsize += blobsize
277 totalblobsize += blobsize
278 else:
278 else:
279 blobsize = "(missing)"
279 blobsize = "(missing)"
280 ui.write("%s %s %s%s\n" % (
280 ui.write("%s %s %s%d\n" % (
281 hashformatter(node),
281 hashformatter(node),
282 hashformatter(deltabase),
282 hashformatter(deltabase),
283 str(deltalen).ljust(14),
283 ('%d' % deltalen).ljust(14),
284 blobsize))
284 blobsize))
285
285
286 if filename is not None:
286 if filename is not None:
@@ -342,7 +342,7 b' def dumpdeltachain(ui, deltachain, **opt'
342 "Delta Length".ljust(6),
342 "Delta Length".ljust(6),
343 ))
343 ))
344
344
345 ui.write("%s %s %s %s\n" % (
345 ui.write("%s %s %s %d\n" % (
346 hashformatter(node),
346 hashformatter(node),
347 hashformatter(deltabasenode),
347 hashformatter(deltabasenode),
348 nodemod.hex(hashlib.sha1(delta).digest()),
348 nodemod.hex(hashlib.sha1(delta).digest()),
General Comments 0
You need to be logged in to leave comments. Login now