mercurial/hbisect.py
changeset 30066 5f93737d0ba8
parent 30065 ee21ed7fc7a2
child 30067 6e88cd060ba2
--- a/mercurial/hbisect.py	Wed Aug 24 04:13:53 2016 +0200
+++ b/mercurial/hbisect.py	Wed Aug 24 04:16:07 2016 +0200
@@ -139,6 +139,19 @@
 
     return ([best_node], tot, good)
 
+def extendrange(repo, state, nodes, good):
+    # bisect is incomplete when it ends on a merge node and
+    # one of the parent was not checked.
+    parents = repo[nodes[0]].parents()
+    if len(parents) > 1:
+        if good:
+            side = state['bad']
+        else:
+            side = state['good']
+        num = len(set(i.node() for i in parents) & set(side))
+        if num == 1:
+            return parents[0].ancestor(parents[1])
+    return None
 
 def load_state(repo):
     state = {'current': [], 'good': [], 'bad': [], 'skip': []}