Mercurial > hg
comparison hgext/histedit.py @ 27403:50b6a04f817f
histedit: omit useless message from abort
specifically:
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
author | timeless <timeless@mozdev.org> |
---|---|
date | Mon, 14 Dec 2015 22:08:14 +0000 |
parents | 43c00ca887d1 |
children | 5837ca674da9 |
comparison
equal
deleted
inserted
replaced
27402:5184089f5d30 | 27403:50b6a04f817f |
---|---|
995 os.remove(backupfile) | 995 os.remove(backupfile) |
996 | 996 |
997 # check whether we should update away | 997 # check whether we should update away |
998 if repo.unfiltered().revs('parents() and (%n or %ln::)', | 998 if repo.unfiltered().revs('parents() and (%n or %ln::)', |
999 state.parentctxnode, leafs | tmpnodes): | 999 state.parentctxnode, leafs | tmpnodes): |
1000 hg.clean(repo, state.topmost) | 1000 hg.clean(repo, state.topmost, show_stats=True, quietempty=True) |
1001 cleanupnode(ui, repo, 'created', tmpnodes) | 1001 cleanupnode(ui, repo, 'created', tmpnodes) |
1002 cleanupnode(ui, repo, 'temp', leafs) | 1002 cleanupnode(ui, repo, 'temp', leafs) |
1003 except Exception: | 1003 except Exception: |
1004 if state.inprogress(): | 1004 if state.inprogress(): |
1005 ui.warn(_('warning: encountered an exception during histedit ' | 1005 ui.warn(_('warning: encountered an exception during histedit ' |