Read about our upcoming Code of Conduct on this issue

Commit b65f5e41 authored by Jörg Sonnenberger's avatar Jörg Sonnenberger
Browse files

revlog: guarantee that p1 != null if a non-null parent exists

This change does not affect the hashing (which already did this
transformation), but can change the log output in the rare case where
this behavior was observed in repositories. The change can simplify
iteration code where regular changesets and merges are distinct
branches.

Differential Revision: https://phab.mercurial-scm.org/D10150
parent 066b8d8f75b8
......@@ -908,8 +908,10 @@ class revlog(object):
if rev == wdirrev:
raise error.WdirUnsupported
raise
return entry[5], entry[6]
if entry[5] == nullrev:
return entry[6], entry[5]
else:
return entry[5], entry[6]
# fast parentrevs(rev) where rev isn't filtered
_uncheckedparentrevs = parentrevs
......@@ -930,7 +932,11 @@ class revlog(object):
def parents(self, node):
i = self.index
d = i[self.rev(node)]
return i[d[5]][7], i[d[6]][7] # map revisions to nodes inline
# inline node() to avoid function call overhead
if d[5] == nullid:
return i[d[6]][7], i[d[5]][7]
else:
return i[d[5]][7], i[d[6]][7]
def chainlen(self, rev):
return self._chaininfo(rev)[0]
......
......@@ -26,6 +26,13 @@
== Backwards Compatibility Changes ==
* In normal repositories, the first parent of a changeset is not null,
unless both parents are null (like the first changeset). Some legacy
repositories violate this condition. The revlog code will now
silentely swap the parents if this condition is tested. This can
change the output of `hg log` when explicitly asking for first or
second parent.
== Internal API Changes ==
......
......@@ -179,7 +179,7 @@ has been emitted, just in a different order.
$ hg log -T '{if(ellipsis,"...")}{node|short} {p1node|short} {p2node|short} {desc}\n' | sort
...2a20009de83e 000000000000 3ac1f5779de3 outside 10
...2a20009de83e 3ac1f5779de3 000000000000 outside 10
...3ac1f5779de3 bb96a08b062a 465567bdfb2d merge a/b/c/d 9
...8d874d57adea 7ef88b4dd4fa 000000000000 outside 12
...b844052e7b3b 000000000000 000000000000 outside 2c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment