# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1259798509 -3600
# Node ID a7d11deb47dd1873a4be0554415e9c0923255046
# Parent  c1d940d31aea053303b53dd0608fc663037ac39c
revlog: add fast path to ancestor

diff -r c1d940d31aea -r a7d11deb47dd mercurial/revlog.py
--- a/mercurial/revlog.py	Tue Dec 01 16:19:53 2009 -0500
+++ b/mercurial/revlog.py	Thu Dec 03 01:01:49 2009 +0100
@@ -1118,10 +1118,19 @@
     def ancestor(self, a, b):
         """calculate the least common ancestor of nodes a and b"""
 
+        # fast path, check if it is a descendant
+        a, b = self.rev(a), self.rev(b)
+        start, end = sorted((a, b))
+        for i in self.descendants(start):
+            if i == end:
+                return self.node(start)
+            elif i > end:
+                break
+
         def parents(rev):
             return [p for p in self.parentrevs(rev) if p != nullrev]
 
-        c = ancestor.ancestor(self.rev(a), self.rev(b), parents)
+        c = ancestor.ancestor(a, b, parents)
         if c is None:
             return nullid