##// END OF EJS Templates
histedit: omit useless message from abort...
timeless -
r27403:50b6a04f default
parent child Browse files
Show More
@@ -997,7 +997,7 b' def _histedit(ui, repo, state, *freeargs'
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:
@@ -663,12 +663,12 b' def update(repo, node):'
663 # naming conflict in clone()
663 # naming conflict in clone()
664 _update = update
664 _update = update
665
665
666 def clean(repo, node, show_stats=True):
666 def clean(repo, node, show_stats=True, quietempty=False):
667 """forcibly switch the working directory to node, clobbering changes"""
667 """forcibly switch the working directory to node, clobbering changes"""
668 stats = updaterepo(repo, node, True)
668 stats = updaterepo(repo, node, True)
669 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
669 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
670 if show_stats:
670 if show_stats:
671 _showstats(repo, stats)
671 _showstats(repo, stats, quietempty)
672 return stats[3] > 0
672 return stats[3] > 0
673
673
674 def merge(repo, node, force=None, remind=True):
674 def merge(repo, node, force=None, remind=True):
@@ -207,5 +207,16 b' modified files should survive the abort '
207 |
207 |
208 @ 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a"
208 @ 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a"
209
209
210 aborting and not changing files can skip mentioning updating (no) files
211 $ hg up
212 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
213 $ hg commit --close-branch -m 'closebranch'
214 $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets
215 % start editing the history (not changing anything)
216 | edit 292aec348d9e 6 closebranch
217 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
218 Make changes as needed, you may commit or record as needed now.
219 When you are finished, run hg histedit --continue to resume.
220 $ hg histedit --abort
210
221
211 $ cd ..
222 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now