equal
deleted
inserted
replaced
1229 return |
1229 return |
1230 elif abortopt: |
1230 elif abortopt: |
1231 if not evolvestate: |
1231 if not evolvestate: |
1232 raise error.Abort(_('no interrupted evolve to stop')) |
1232 raise error.Abort(_('no interrupted evolve to stop')) |
1233 evolvestate.load() |
1233 evolvestate.load() |
|
1234 # `hg next --evolve` in play |
|
1235 if evolvestate['command'] != 'evolve': |
|
1236 pctx = repo['.'] |
|
1237 hg.updaterepo(repo, pctx.node(), True) |
|
1238 ui.status(_('evolve aborted\n')) |
|
1239 ui.status(_('working directory is now at %s\n') |
|
1240 % pctx.hex()[:12]) |
|
1241 return 0 |
1234 return abortevolve(ui, repo, evolvestate) |
1242 return abortevolve(ui, repo, evolvestate) |
1235 else: |
1243 else: |
1236 cmdutil.bailifchanged(repo) |
1244 cmdutil.bailifchanged(repo) |
1237 |
1245 |
1238 revs = _selectrevs(repo, allopt, revopt, anyopt, targetcat) |
1246 revs = _selectrevs(repo, allopt, revopt, anyopt, targetcat) |