equal
deleted
inserted
replaced
1472 progresscb() |
1472 progresscb() |
1473 _cleanup(ui, repo, startnode, showprogress, shouldupdate) |
1473 _cleanup(ui, repo, startnode, showprogress, shouldupdate) |
1474 |
1474 |
1475 def stopevolve(ui, repo, evolvestate): |
1475 def stopevolve(ui, repo, evolvestate): |
1476 """logic for handling of `hg evolve --stop`""" |
1476 """logic for handling of `hg evolve --stop`""" |
1477 pctx = repo['.'] |
1477 updated = False |
1478 hg.updaterepo(repo, pctx.node(), True) |
1478 pctx = None |
|
1479 if not updated: |
|
1480 pctx = repo['.'] |
|
1481 hg.updaterepo(repo, pctx.node(), True) |
1479 ui.status(_('stopped the interrupted evolve\n')) |
1482 ui.status(_('stopped the interrupted evolve\n')) |
1480 ui.status(_('working directory is now at %s\n') % pctx) |
1483 ui.status(_('working directory is now at %s\n') % pctx) |
1481 |
1484 |
1482 def abortevolve(ui, repo, evolvestate): |
1485 def abortevolve(ui, repo, evolvestate): |
1483 """ logic for handling of `hg evolve --abort`""" |
1486 """ logic for handling of `hg evolve --abort`""" |