diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py index 5b1495c37b0cbc75a3f18f1d0a5f5b381eeb555d_bWVyY3VyaWFsL2RlYnVnY29tbWFuZHMucHk=..0a86cb154e835e9b75d302c93a34cdd97a3b0ea0_bWVyY3VyaWFsL2RlYnVnY29tbWFuZHMucHk= 100644 --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -103,6 +103,7 @@ ) from .revlogutils import ( + constants as revlog_constants, deltas as deltautil, nodemap, rewrite, @@ -796,7 +797,7 @@ def revinfo(rev): e = index[rev] - compsize = e[1] - uncompsize = e[2] + compsize = e[revlog_constants.ENTRY_DATA_COMPRESSED_LENGTH] + uncompsize = e[revlog_constants.ENTRY_DATA_UNCOMPRESSED_LENGTH] chainsize = 0 @@ -801,3 +802,7 @@ chainsize = 0 + base = e[revlog_constants.ENTRY_DELTA_BASE] + p1 = e[revlog_constants.ENTRY_PARENT_1] + p2 = e[revlog_constants.ENTRY_PARENT_2] + if generaldelta: @@ -803,3 +808,3 @@ if generaldelta: - if e[3] == e[5]: + if base == p1: deltatype = b'p1' @@ -805,3 +810,3 @@ deltatype = b'p1' - elif e[3] == e[6]: + elif base == p2: deltatype = b'p2' @@ -807,5 +812,5 @@ deltatype = b'p2' - elif e[3] == rev: + elif base == rev: deltatype = b'base' elif r.issnapshot(rev): deltatype = b'snap' @@ -809,8 +814,8 @@ deltatype = b'base' elif r.issnapshot(rev): deltatype = b'snap' - elif e[3] == rev - 1: + elif base == rev - 1: deltatype = b'prev' else: deltatype = b'other' else: @@ -813,8 +818,8 @@ deltatype = b'prev' else: deltatype = b'other' else: - if e[3] == rev: + if base == rev: deltatype = b'base' else: deltatype = b'prev' @@ -822,7 +827,7 @@ chain = r._deltachain(rev)[0] for iterrev in chain: e = index[iterrev] - chainsize += e[1] + chainsize += e[revlog_constants.ENTRY_DATA_COMPRESSED_LENGTH] return compsize, uncompsize, deltatype, chain, chainsize