##// END OF EJS Templates
corruption: backout changeset 49fd21f32695 (issue6528)...
marmoute -
r48740:411dc27f 5.8.1 stable
parent child Browse files
Show More
@@ -884,10 +884,8 b' class revlog(object):'
884 if rev == wdirrev:
884 if rev == wdirrev:
885 raise error.WdirUnsupported
885 raise error.WdirUnsupported
886 raise
886 raise
887 if entry[5] == nullrev:
887
888 return entry[6], entry[5]
888 return entry[5], entry[6]
889 else:
890 return entry[5], entry[6]
891
889
892 # fast parentrevs(rev) where rev isn't filtered
890 # fast parentrevs(rev) where rev isn't filtered
893 _uncheckedparentrevs = parentrevs
891 _uncheckedparentrevs = parentrevs
@@ -908,11 +906,7 b' class revlog(object):'
908 def parents(self, node):
906 def parents(self, node):
909 i = self.index
907 i = self.index
910 d = i[self.rev(node)]
908 d = i[self.rev(node)]
911 # inline node() to avoid function call overhead
909 return i[d[5]][7], i[d[6]][7] # map revisions to nodes inline
912 if d[5] == nullid:
913 return i[d[6]][7], i[d[5]][7]
914 else:
915 return i[d[5]][7], i[d[6]][7]
916
910
917 def chainlen(self, rev):
911 def chainlen(self, rev):
918 return self._chaininfo(rev)[0]
912 return self._chaininfo(rev)[0]
@@ -126,10 +126,8 b' Status is buggy, even with debugrebuildd'
126 5
126 5
127 bar
127 bar
128 $ hg status
128 $ hg status
129 M b.txt (known-bad-output !)
130 $ hg debugrebuilddirstate
129 $ hg debugrebuilddirstate
131 $ hg status
130 $ hg status
132 M b.txt (known-bad-output !)
133
131
134 the history was altered
132 the history was altered
135
133
@@ -139,8 +137,7 b' marker that some metadata are present an'
139 $ hg debugrevlogindex b.txt
137 $ hg debugrevlogindex b.txt
140 rev linkrev nodeid p1 p2
138 rev linkrev nodeid p1 p2
141 0 2 05b806ebe5ea 000000000000 000000000000
139 0 2 05b806ebe5ea 000000000000 000000000000
142 1 3 a58b36ad6b65 05b806ebe5ea 000000000000 (known-bad-output !)
140 1 3 a58b36ad6b65 000000000000 05b806ebe5ea
143 1 3 a58b36ad6b65 000000000000 05b806ebe5ea (missing-correct-output !)
144
141
145 Check commit Graph
142 Check commit Graph
146
143
@@ -179,7 +179,7 b' has been emitted, just in a different or'
179
179
180
180
181 $ hg log -T '{if(ellipsis,"...")}{node|short} {p1node|short} {p2node|short} {desc}\n' | sort
181 $ hg log -T '{if(ellipsis,"...")}{node|short} {p1node|short} {p2node|short} {desc}\n' | sort
182 ...2a20009de83e 3ac1f5779de3 000000000000 outside 10
182 ...2a20009de83e 000000000000 3ac1f5779de3 outside 10
183 ...3ac1f5779de3 bb96a08b062a 465567bdfb2d merge a/b/c/d 9
183 ...3ac1f5779de3 bb96a08b062a 465567bdfb2d merge a/b/c/d 9
184 ...8d874d57adea 7ef88b4dd4fa 000000000000 outside 12
184 ...8d874d57adea 7ef88b4dd4fa 000000000000 outside 12
185 ...b844052e7b3b 000000000000 000000000000 outside 2c
185 ...b844052e7b3b 000000000000 000000000000 outside 2c
General Comments 0
You need to be logged in to leave comments. Login now