Mercurial > hg
diff mercurial/unionrepo.py @ 27433:12f727a5b434
changegroup: add flags field to cg3 delta header
This lets revlog flags be transmitted over the wire. Right now this is
useful for censored nodes and for narrowhg's ellipsis nodes.
| author | Mike Edgar <adgar@google.com> |
|---|---|
| date | Mon, 14 Dec 2015 15:55:12 -0500 |
| parents | 56b2bcea2529 |
| children | 443848eece18 |
line wrap: on
line diff
--- a/mercurial/unionrepo.py Fri Dec 11 11:23:49 2015 -0500 +++ b/mercurial/unionrepo.py Mon Dec 14 15:55:12 2015 -0500 @@ -51,6 +51,7 @@ rev = self.revlog2.index[rev2] # rev numbers - in revlog2, very different from self.rev _start, _csize, _rsize, base, linkrev, p1rev, p2rev, node = rev + flags = _start & 0xFFFF if linkmapper is None: # link is to same revlog assert linkrev == rev2 # we never link back @@ -69,7 +70,7 @@ p1node = self.revlog2.node(p1rev) p2node = self.revlog2.node(p2rev) - e = (None, None, None, base, + e = (flags, None, None, base, link, self.rev(p1node), self.rev(p2node), node) self.index.insert(-1, e) self.nodemap[node] = n