equal
deleted
inserted
replaced
665 |
665 |
666 state = hbisect.load_state(repo) |
666 state = hbisect.load_state(repo) |
667 |
667 |
668 if command: |
668 if command: |
669 changesets = 1 |
669 changesets = 1 |
670 try: |
670 if noupdate: |
671 node = state['current'][0] |
671 try: |
672 except LookupError: |
672 node = state['current'][0] |
673 if noupdate: |
673 except LookupError: |
674 raise util.Abort(_('current bisect revision is unknown - ' |
674 raise util.Abort(_('current bisect revision is unknown - ' |
675 'start a new bisect to fix')) |
675 'start a new bisect to fix')) |
|
676 else: |
676 node, p2 = repo.dirstate.parents() |
677 node, p2 = repo.dirstate.parents() |
677 if p2 != nullid: |
678 if p2 != nullid: |
678 raise util.Abort(_('current bisect revision is a merge')) |
679 raise util.Abort(_('current bisect revision is a merge')) |
679 try: |
680 try: |
680 while changesets: |
681 while changesets: |