# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1393278134 -3600
# Node ID 514d32de6646500cd46f521c49dff46860ae70ba
# Parent  db0740a487ab1adc0d3c3c126de0b3915528fce1
revlog: introduce commonancestors method for getting all common ancestor heads

diff -r db0740a487ab -r 514d32de6646 mercurial/revlog.py
--- a/mercurial/revlog.py	Mon Feb 24 22:42:14 2014 +0100
+++ b/mercurial/revlog.py	Mon Feb 24 22:42:14 2014 +0100
@@ -734,17 +734,21 @@
                 break
         return False
 
-    def ancestor(self, a, b):
-        """calculate the least common ancestor of nodes a and b"""
-
+    def commonancestors(self, a, b):
+        """calculate the least common ancestors of nodes a and b"""
         a, b = self.rev(a), self.rev(b)
         try:
             ancs = self.index.ancestors(a, b)
-        except (AttributeError, OverflowError):
+        except (AttributeError, OverflowError): # C implementation failed
             ancs = ancestor.ancestors(self.parentrevs, a, b)
+        return map(self.node, ancs)
+
+    def ancestor(self, a, b):
+        """calculate a least common ancestor of nodes a and b"""
+        ancs = self.commonancestors(a, b)
         if ancs:
             # choose a consistent winner when there's a tie
-            return min(map(self.node, ancs))
+            return min(ancs)
         return nullid
 
     def _match(self, id):