1080 for idx, (action, nextact) in enumerate( |
1080 for idx, (action, nextact) in enumerate( |
1081 zip(actions, actions[1:] + [None])): |
1081 zip(actions, actions[1:] + [None])): |
1082 if action.verb == 'fold' and nextact and nextact.verb == 'fold': |
1082 if action.verb == 'fold' and nextact and nextact.verb == 'fold': |
1083 state.actions[idx].__class__ = _multifold |
1083 state.actions[idx].__class__ = _multifold |
1084 |
1084 |
|
1085 total = len(state.actions) |
|
1086 pos = 0 |
1085 while state.actions: |
1087 while state.actions: |
1086 state.write() |
1088 state.write() |
1087 actobj = state.actions.pop(0) |
1089 actobj = state.actions.pop(0) |
|
1090 pos += 1 |
|
1091 ui.progress(_("editing"), pos, actobj.torule(), |
|
1092 _('changes'), total) |
1088 ui.debug('histedit: processing %s %s\n' % (actobj.verb,\ |
1093 ui.debug('histedit: processing %s %s\n' % (actobj.verb,\ |
1089 actobj.torule())) |
1094 actobj.torule())) |
1090 parentctx, replacement_ = actobj.run() |
1095 parentctx, replacement_ = actobj.run() |
1091 state.parentctxnode = parentctx.node() |
1096 state.parentctxnode = parentctx.node() |
1092 state.replacements.extend(replacement_) |
1097 state.replacements.extend(replacement_) |
1093 state.write() |
1098 state.write() |
|
1099 ui.progress(_("editing"), None) |
1094 |
1100 |
1095 hg.update(repo, state.parentctxnode, quietempty=True) |
1101 hg.update(repo, state.parentctxnode, quietempty=True) |
1096 |
1102 |
1097 mapping, tmpnodes, created, ntm = processreplacement(state) |
1103 mapping, tmpnodes, created, ntm = processreplacement(state) |
1098 if mapping: |
1104 if mapping: |