Show More
@@ -893,6 +893,8 b' def bisect(ui, repo, rev=None, extra=Non' | |||||
893 | node, p2 = repo.dirstate.parents() |
|
893 | node, p2 = repo.dirstate.parents() | |
894 | if p2 != nullid: |
|
894 | if p2 != nullid: | |
895 | raise error.Abort(_('current bisect revision is a merge')) |
|
895 | raise error.Abort(_('current bisect revision is a merge')) | |
|
896 | if rev: | |||
|
897 | node = repo[scmutil.revsingle(repo, rev, node)].node() | |||
896 | try: |
|
898 | try: | |
897 | while changesets: |
|
899 | while changesets: | |
898 | # update state |
|
900 | # update state | |
@@ -910,9 +912,8 b' def bisect(ui, repo, rev=None, extra=Non' | |||||
910 | raise error.Abort(_("%s killed") % command) |
|
912 | raise error.Abort(_("%s killed") % command) | |
911 | else: |
|
913 | else: | |
912 | transition = "bad" |
|
914 | transition = "bad" | |
913 | ctx = scmutil.revsingle(repo, rev, node) |
|
915 | state[transition].append(node) | |
914 | rev = None # clear for future iterations |
|
916 | ctx = repo[node] | |
915 | state[transition].append(ctx.node()) |
|
|||
916 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
917 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) | |
917 | hbisect.checkstate(state) |
|
918 | hbisect.checkstate(state) | |
918 | # bisect |
|
919 | # bisect |
General Comments 0
You need to be logged in to leave comments.
Login now