equal
deleted
inserted
replaced
1665 stopevolve(ui, repo, evolvestate) |
1665 stopevolve(ui, repo, evolvestate) |
1666 evolvestate.delete() |
1666 evolvestate.delete() |
1667 return |
1667 return |
1668 elif abortopt: |
1668 elif abortopt: |
1669 if not evolvestate: |
1669 if not evolvestate: |
1670 raise error.Abort(_('no interrupted evolve to stop')) |
1670 raise error.Abort(_('no interrupted evolve to abort')) |
1671 evolvestate.load() |
1671 evolvestate.load() |
1672 # `hg next --evolve` in play |
1672 # `hg next --evolve` in play |
1673 if evolvestate['command'] != 'evolve': |
1673 if evolvestate['command'] != 'evolve': |
1674 pctx = repo['.'] |
1674 pctx = repo['.'] |
1675 hg.updaterepo(repo, pctx.node(), True) |
1675 hg.updaterepo(repo, pctx.node(), True) |