Mercurial > public > mercurial-scm > hg-stable
diff tests/test-revlog-raw.py @ 34298:1db9abf407c5
revlog: add revmap back to revlog.addgroup
The recent c8b6ed51386b patch removed the linkmapper argument from addgroup, as
part of trying to make addgroup more agnostic from the changegroup format. It
turns out that the changegroup can't resolve linkrevs while iterating over the
deltas, because applying the deltas might affect the linkrev resolution. For
example, when applying a series of changelog entries, the linkmapper just
returns len(cl). If we're iterating over the deltas without applying them to the
changelog, this results in incorrect linkrevs. This was caught by the hgsql
extension, which reads the revisions before applying them.
The fix is to return linknodes as part of the delta iterator, and let the
consumer choose what to do.
Differential Revision: https://phab.mercurial-scm.org/D730
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Wed, 20 Sep 2017 09:22:22 -0700 |
| parents | c8b6ed51386b |
| children | edc9330acac1 |
line wrap: on
line diff
--- a/tests/test-revlog-raw.py Tue Sep 19 22:06:26 2017 -0700 +++ b/tests/test-revlog-raw.py Wed Sep 20 09:22:22 2017 -0700 @@ -119,7 +119,7 @@ 'deltabase': rlog.node(deltaparent), 'delta': rlog.revdiff(deltaparent, r)} - def deltaiter(self, linkmapper): + def deltaiter(self): chain = None for chunkdata in iter(lambda: self.deltachunk(chain), {}): node = chunkdata['node'] @@ -130,17 +130,16 @@ delta = chunkdata['delta'] flags = chunkdata['flags'] - link = linkmapper(cs) chain = node - yield (node, p1, p2, link, deltabase, delta, flags) + yield (node, p1, p2, cs, deltabase, delta, flags) def linkmap(lnode): return rlog.rev(lnode) dlog = newrevlog(destname, recreate=True) - dummydeltas = dummychangegroup().deltaiter(linkmap) - dlog.addgroup(dummydeltas, tr) + dummydeltas = dummychangegroup().deltaiter() + dlog.addgroup(dummydeltas, linkmap, tr) return dlog def lowlevelcopy(rlog, tr, destname=b'_destrevlog.i'):