Show More
@@ -908,7 +908,9 b' class revlog(object):' | |||
|
908 | 908 | if rev == wdirrev: |
|
909 | 909 | raise error.WdirUnsupported |
|
910 | 910 | raise |
|
911 | ||
|
911 | if entry[5] == nullrev: | |
|
912 | return entry[6], entry[5] | |
|
913 | else: | |
|
912 | 914 | return entry[5], entry[6] |
|
913 | 915 | |
|
914 | 916 | # fast parentrevs(rev) where rev isn't filtered |
@@ -930,7 +932,11 b' class revlog(object):' | |||
|
930 | 932 | def parents(self, node): |
|
931 | 933 | i = self.index |
|
932 | 934 | d = i[self.rev(node)] |
|
933 | return i[d[5]][7], i[d[6]][7] # map revisions to nodes inline | |
|
935 | # inline node() to avoid function call overhead | |
|
936 | if d[5] == nullid: | |
|
937 | return i[d[6]][7], i[d[5]][7] | |
|
938 | else: | |
|
939 | return i[d[5]][7], i[d[6]][7] | |
|
934 | 940 | |
|
935 | 941 | def chainlen(self, rev): |
|
936 | 942 | return self._chaininfo(rev)[0] |
@@ -26,6 +26,13 b'' | |||
|
26 | 26 | |
|
27 | 27 | == Backwards Compatibility Changes == |
|
28 | 28 | |
|
29 | * In normal repositories, the first parent of a changeset is not null, | |
|
30 | unless both parents are null (like the first changeset). Some legacy | |
|
31 | repositories violate this condition. The revlog code will now | |
|
32 | silentely swap the parents if this condition is tested. This can | |
|
33 | change the output of `hg log` when explicitly asking for first or | |
|
34 | second parent. | |
|
35 | ||
|
29 | 36 | |
|
30 | 37 | == Internal API Changes == |
|
31 | 38 |
@@ -179,7 +179,7 b' has been emitted, just in a different or' | |||
|
179 | 179 | |
|
180 | 180 | |
|
181 | 181 | $ hg log -T '{if(ellipsis,"...")}{node|short} {p1node|short} {p2node|short} {desc}\n' | sort |
|
182 |
...2a20009de83e |
|
|
182 | ...2a20009de83e 3ac1f5779de3 000000000000 outside 10 | |
|
183 | 183 | ...3ac1f5779de3 bb96a08b062a 465567bdfb2d merge a/b/c/d 9 |
|
184 | 184 | ...8d874d57adea 7ef88b4dd4fa 000000000000 outside 12 |
|
185 | 185 | ...b844052e7b3b 000000000000 000000000000 outside 2c |
General Comments 0
You need to be logged in to leave comments.
Login now