equal
deleted
inserted
replaced
1105 |
1105 |
1106 def progresscb(): |
1106 def progresscb(): |
1107 if revopt or allopt: |
1107 if revopt or allopt: |
1108 ui.progress(_('evolve'), seen, unit=_('changesets'), total=count) |
1108 ui.progress(_('evolve'), seen, unit=_('changesets'), total=count) |
1109 |
1109 |
|
1110 evolvestate = state.cmdstate(repo) |
1110 # Continuation handling |
1111 # Continuation handling |
1111 if contopt: |
1112 if contopt: |
1112 evolvestate = state.cmdstate(repo) |
|
1113 if not evolvestate: |
1113 if not evolvestate: |
1114 raise error.Abort('no evolve to continue') |
1114 raise error.Abort('no evolve to continue') |
1115 evolvestate.load() |
1115 evolvestate.load() |
1116 orig = repo[evolvestate['current']] |
1116 orig = repo[evolvestate['current']] |
1117 with repo.wlock(), repo.lock(): |
1117 with repo.wlock(), repo.lock(): |