[Updated] D9160: bundlerepo: don't insert index tuples with full nodes as linkrev
joerg.sonnenberger (Joerg Sonnenberger)
phabricator at mercurial-scm.org
Tue Nov 3 18:55:58 UTC 2020
Closed by commit rHG88d5abec8f61: bundlerepo: don't insert index tuples with full nodes as linkrev (authored by joerg.sonnenberger).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D9160?vs=23405&id=23408
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D9160/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D9160
AFFECTED FILES
mercurial/bundlerepo.py
CHANGE DETAILS
diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py
+++ b/mercurial/bundlerepo.py
@@ -63,11 +63,14 @@
size = len(delta)
start = cgunpacker.tell() - size
- link = linkmapper(cs)
if self.index.has_node(node):
# this can happen if two branches make the same change
self.bundlerevs.add(self.index.rev(node))
continue
+ if cs == node:
+ linkrev = nullrev
+ else:
+ linkrev = linkmapper(cs)
for p in (p1, p2):
if not self.index.has_node(p):
@@ -87,7 +90,7 @@
size,
-1,
baserev,
- link,
+ linkrev,
self.rev(p1),
self.rev(p2),
node,
To: joerg.sonnenberger, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20201103/77574265/attachment-0002.html>
More information about the Mercurial-patches
mailing list