1207 |
1207 |
1208 # check whether we should update away |
1208 # check whether we should update away |
1209 if repo.unfiltered().revs('parents() and (%n or %ln::)', |
1209 if repo.unfiltered().revs('parents() and (%n or %ln::)', |
1210 state.parentctxnode, leafs | tmpnodes): |
1210 state.parentctxnode, leafs | tmpnodes): |
1211 hg.clean(repo, state.topmost, show_stats=True, quietempty=True) |
1211 hg.clean(repo, state.topmost, show_stats=True, quietempty=True) |
1212 safecleanupnode(ui, repo, 'created', tmpnodes) |
1212 cleanupnode(ui, repo, 'created', tmpnodes) |
1213 safecleanupnode(ui, repo, 'temp', leafs) |
1213 cleanupnode(ui, repo, 'temp', leafs) |
1214 except Exception: |
1214 except Exception: |
1215 if state.inprogress(): |
1215 if state.inprogress(): |
1216 ui.warn(_('warning: encountered an exception during histedit ' |
1216 ui.warn(_('warning: encountered an exception during histedit ' |
1217 '--abort; the repository may not have been completely ' |
1217 '--abort; the repository may not have been completely ' |
1218 'cleaned up\n')) |
1218 'cleaned up\n')) |