equal
deleted
inserted
replaced
1169 if len(succs) > 1: |
1169 if len(succs) > 1: |
1170 m = 'histedit: %s' |
1170 m = 'histedit: %s' |
1171 for n in succs[1:]: |
1171 for n in succs[1:]: |
1172 ui.debug(m % node.short(n)) |
1172 ui.debug(m % node.short(n)) |
1173 |
1173 |
1174 safecleanupnode(ui, repo, tmpnodes) |
|
1175 |
|
1176 if not state.keep: |
1174 if not state.keep: |
1177 if mapping: |
1175 if mapping: |
1178 movebookmarks(ui, repo, mapping, state.topmost, ntm) |
1176 movebookmarks(ui, repo, mapping, state.topmost, ntm) |
1179 # TODO update mq state |
1177 # TODO update mq state |
1180 safecleanupnode(ui, repo, mapping) |
1178 else: |
|
1179 mapping = {} |
|
1180 |
|
1181 for n in tmpnodes: |
|
1182 mapping[n] = () |
|
1183 |
|
1184 safecleanupnode(ui, repo, mapping) |
1181 |
1185 |
1182 state.clear() |
1186 state.clear() |
1183 if os.path.exists(repo.sjoin('undo')): |
1187 if os.path.exists(repo.sjoin('undo')): |
1184 os.unlink(repo.sjoin('undo')) |
1188 os.unlink(repo.sjoin('undo')) |
1185 if repo.vfs.exists('histedit-last-edit.txt'): |
1189 if repo.vfs.exists('histedit-last-edit.txt'): |