Mercurial > public > mercurial-scm > hg

comparison mercurial/hbisect.py @ 20094:06ef32c3b4bb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bisect: report "both good and bad" as such, not as "not directly related"
author Mads Kiilerich <madski@unity3d.com>
date Sun, 10 Nov 2013 18:51:21 +0100
parents 07771e233cf1
children 1c46b18b0e1c
comparison
equal deleted inserted replaced
20093:1dee888b22f7 20094:06ef32c3b4bb
60 if not ancestors: # looking for bad to good transition? 60 if not ancestors: # looking for bad to good transition?
61 good = True 61 good = True
62 badrev, ancestors = buildancestors(state['good'], state['bad']) 62 badrev, ancestors = buildancestors(state['good'], state['bad'])
63 bad = changelog.node(badrev) 63 bad = changelog.node(badrev)
64 if not ancestors: # now we're confused 64 if not ancestors: # now we're confused
65 if len(state['bad']) == 1 and len(state['good']) == 1: 65 if (len(state['bad']) == 1 and len(state['good']) == 1 and
66 state['bad'] != state['good']):
66 raise util.Abort(_("starting revisions are not directly related")) 67 raise util.Abort(_("starting revisions are not directly related"))
67 raise util.Abort(_("inconsistent state, %s:%s is good and bad") 68 raise util.Abort(_("inconsistent state, %s:%s is good and bad")
68 % (badrev, short(bad))) 69 % (badrev, short(bad)))
69 70
70 # build children dict 71 # build children dict