##// END OF EJS Templates
revlog: remove legacy usage of `canonical_parent_order`...
marmoute -
r51958:14574a41 default
parent child Browse files
Show More
@@ -1223,7 +1223,7 b' class revlog:'
1223 raise error.WdirUnsupported
1223 raise error.WdirUnsupported
1224 raise
1224 raise
1225
1225
1226 if self.canonical_parent_order and entry[5] == nullrev:
1226 if self.feature_config.canonical_parent_order and entry[5] == nullrev:
1227 return entry[6], entry[5]
1227 return entry[6], entry[5]
1228 else:
1228 else:
1229 return entry[5], entry[6]
1229 return entry[5], entry[6]
@@ -1248,7 +1248,7 b' class revlog:'
1248 i = self.index
1248 i = self.index
1249 d = i[self.rev(node)]
1249 d = i[self.rev(node)]
1250 # inline node() to avoid function call overhead
1250 # inline node() to avoid function call overhead
1251 if self.canonical_parent_order and d[5] == self.nullid:
1251 if self.feature_config.canonical_parent_order and d[5] == self.nullid:
1252 return i[d[6]][7], i[d[5]][7]
1252 return i[d[6]][7], i[d[5]][7]
1253 else:
1253 else:
1254 return i[d[5]][7], i[d[6]][7]
1254 return i[d[5]][7], i[d[6]][7]
General Comments 0
You need to be logged in to leave comments. Login now