Mercurial > public > mercurial-scm > hg

comparison mercurial/hbisect.py @ 20095:1c46b18b0e1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Nov 2013 17:26:58 -0600
parents 1e5b38a919dd 06ef32c3b4bb
children 7cc77030c557
comparison
equal deleted inserted replaced
20091:abfe6a8e619b 20095:1c46b18b0e1c
61 if not ancestors: # looking for bad to good transition? 61 if not ancestors: # looking for bad to good transition?
62 good = True 62 good = True
63 badrev, ancestors = buildancestors(state['good'], state['bad']) 63 badrev, ancestors = buildancestors(state['good'], state['bad'])
64 bad = changelog.node(badrev) 64 bad = changelog.node(badrev)
65 if not ancestors: # now we're confused 65 if not ancestors: # now we're confused
66 if len(state['bad']) == 1 and len(state['good']) == 1: 66 if (len(state['bad']) == 1 and len(state['good']) == 1 and
67 state['bad'] != state['good']):
67 raise util.Abort(_("starting revisions are not directly related")) 68 raise util.Abort(_("starting revisions are not directly related"))
68 raise util.Abort(_("inconsistent state, %s:%s is good and bad") 69 raise util.Abort(_("inconsistent state, %s:%s is good and bad")
69 % (badrev, short(bad))) 70 % (badrev, short(bad)))
70 71
71 # build children dict 72 # build children dict