Show More
@@ -33,6 +33,7 b' from . import (' | |||||
33 | error, |
|
33 | error, | |
34 | mdiff, |
|
34 | mdiff, | |
35 | parsers, |
|
35 | parsers, | |
|
36 | pycompat, | |||
36 | templatefilters, |
|
37 | templatefilters, | |
37 | util, |
|
38 | util, | |
38 | ) |
|
39 | ) | |
@@ -943,7 +944,7 b' class revlog(object):' | |||||
943 | ancs = self.index.commonancestorsheads(a, b) |
|
944 | ancs = self.index.commonancestorsheads(a, b) | |
944 | except (AttributeError, OverflowError): # C implementation failed |
|
945 | except (AttributeError, OverflowError): # C implementation failed | |
945 | ancs = ancestor.commonancestorsheads(self.parentrevs, a, b) |
|
946 | ancs = ancestor.commonancestorsheads(self.parentrevs, a, b) | |
946 | return map(self.node, ancs) |
|
947 | return pycompat.maplist(self.node, ancs) | |
947 |
|
948 | |||
948 | def isancestor(self, a, b): |
|
949 | def isancestor(self, a, b): | |
949 | """return True if node a is an ancestor of node b |
|
950 | """return True if node a is an ancestor of node b |
General Comments 0
You need to be logged in to leave comments.
Login now