equal
deleted
inserted
replaced
597 replacements = [] |
597 replacements = [] |
598 keep = opts.get('keep', False) |
598 keep = opts.get('keep', False) |
599 |
599 |
600 # rebuild state |
600 # rebuild state |
601 if goal == 'continue': |
601 if goal == 'continue': |
602 state = histeditstate(repo) |
|
603 state.read() |
602 state.read() |
604 state = bootstrapcontinue(ui, state, opts) |
603 state = bootstrapcontinue(ui, state, opts) |
605 elif goal == 'abort': |
604 elif goal == 'abort': |
606 state = histeditstate(repo) |
|
607 state.read() |
605 state.read() |
608 mapping, tmpnodes, leafs, _ntm = processreplacement(state) |
606 mapping, tmpnodes, leafs, _ntm = processreplacement(state) |
609 ui.debug('restore wc to old parent %s\n' % node.short(state.topmost)) |
607 ui.debug('restore wc to old parent %s\n' % node.short(state.topmost)) |
610 # check whether we should update away |
608 # check whether we should update away |
611 parentnodes = [c.node() for c in repo[None].parents()] |
609 parentnodes = [c.node() for c in repo[None].parents()] |