| pulkit |
| hg-reviewers |
A few remotefilelog tests still fail on Python 3, but it's a much better story
now.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/remotefilelog/basestore.py (2 lines) | |||
| M | hgext/remotefilelog/debugcommands.py (10 lines) |
| raise | raise | ||||
| msg = _("warning: file %s was removed by another process\n") | msg = _("warning: file %s was removed by another process\n") | ||||
| ui.warn(msg % oldpath) | ui.warn(msg % oldpath) | ||||
| size -= oldpathstat.st_size | size -= oldpathstat.st_size | ||||
| removed += 1 | removed += 1 | ||||
| removedexcess += oldpathstat.st_size | removedexcess += oldpathstat.st_size | ||||
| progress.complete() | 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, | % (removed, count, | ||||
| float(originalsize) / 1024.0 / 1024.0 / 1024.0, | float(originalsize) / 1024.0 / 1024.0 / 1024.0, | ||||
| float(size) / 1024.0 / 1024.0 / 1024.0)) | float(size) / 1024.0 / 1024.0 / 1024.0)) | ||||
| class baseunionstore(object): | class baseunionstore(object): | ||||
| def __init__(self, *args, **kwargs): | def __init__(self, *args, **kwargs): | ||||
| # If one of the functions that iterates all of the stores is about to | # If one of the functions that iterates all of the stores is about to | ||||
| # throw a KeyError, try this many times with a full refresh between | # throw a KeyError, try this many times with a full refresh between | ||||
| return | return | ||||
| difference = totalblobsize - totaldeltasize | difference = totalblobsize - totaldeltasize | ||||
| deltastr = "%0.1f%% %s" % ( | deltastr = "%0.1f%% %s" % ( | ||||
| (100.0 * abs(difference) / totalblobsize), | (100.0 * abs(difference) / totalblobsize), | ||||
| ("smaller" if difference > 0 else "bigger")) | ("smaller" if difference > 0 else "bigger")) | ||||
| ui.write(("Total:%s%s %s (%s)\n") % ( | ui.write(("Total:%s%s %s (%s)\n") % ( | ||||
| "".ljust(2 * hashlen - len("Total:")), | "".ljust(2 * hashlen - len("Total:")), | ||||
| str(totaldeltasize).ljust(12), | ('%d' % totaldeltasize).ljust(12), | ||||
| str(totalblobsize).ljust(9), | ('%d' % totalblobsize).ljust(9), | ||||
| deltastr | deltastr | ||||
| )) | )) | ||||
| bases = {} | bases = {} | ||||
| nodes = set() | nodes = set() | ||||
| failures = 0 | failures = 0 | ||||
| for filename, node, deltabase, deltalen in dpack.iterentries(): | for filename, node, deltabase, deltalen in dpack.iterentries(): | ||||
| bases[node] = deltabase | bases[node] = deltabase | ||||
| # Metadata could be missing, in which case it will be an empty dict. | # Metadata could be missing, in which case it will be an empty dict. | ||||
| meta = dpack.getmeta(filename, node) | meta = dpack.getmeta(filename, node) | ||||
| if constants.METAKEYSIZE in meta: | if constants.METAKEYSIZE in meta: | ||||
| blobsize = meta[constants.METAKEYSIZE] | blobsize = meta[constants.METAKEYSIZE] | ||||
| totaldeltasize += deltalen | totaldeltasize += deltalen | ||||
| totalblobsize += blobsize | totalblobsize += blobsize | ||||
| else: | else: | ||||
| blobsize = "(missing)" | blobsize = "(missing)" | ||||
| ui.write("%s %s %s%s\n" % ( | ui.write("%s %s %s%d\n" % ( | ||||
| hashformatter(node), | hashformatter(node), | ||||
| hashformatter(deltabase), | hashformatter(deltabase), | ||||
| str(deltalen).ljust(14), | ('%d' % deltalen).ljust(14), | ||||
| blobsize)) | blobsize)) | ||||
| if filename is not None: | if filename is not None: | ||||
| printtotals() | printtotals() | ||||
| failures += _sanitycheck(ui, set(nodes), bases) | failures += _sanitycheck(ui, set(nodes), bases) | ||||
| if failures > 1: | if failures > 1: | ||||
| ui.warn(("%d failures\n" % failures)) | ui.warn(("%d failures\n" % failures)) | ||||
| lastfilename = filename | lastfilename = filename | ||||
| ui.write("%s %s %s %s\n" % ( | ui.write("%s %s %s %s\n" % ( | ||||
| "Node".ljust(hashlen), | "Node".ljust(hashlen), | ||||
| "Delta Base".ljust(hashlen), | "Delta Base".ljust(hashlen), | ||||
| "Delta SHA1".ljust(hashlen), | "Delta SHA1".ljust(hashlen), | ||||
| "Delta Length".ljust(6), | "Delta Length".ljust(6), | ||||
| )) | )) | ||||
| ui.write("%s %s %s %s\n" % ( | ui.write("%s %s %s %d\n" % ( | ||||
| hashformatter(node), | hashformatter(node), | ||||
| hashformatter(deltabasenode), | hashformatter(deltabasenode), | ||||
| nodemod.hex(hashlib.sha1(delta).digest()), | nodemod.hex(hashlib.sha1(delta).digest()), | ||||
| len(delta))) | len(delta))) | ||||
| def debughistorypack(ui, path): | def debughistorypack(ui, path): | ||||
| if '.hist' in path: | if '.hist' in path: | ||||
| path = path[:path.index('.hist')] | path = path[:path.index('.hist')] | ||||