facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

histedit: omit useless message from update (edit)

Browse Source 
specifically:
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
This commit is contained in:
timeless 2015-12-14 23:04:17 +00:00
parent 26fb25b6cd
commit 2abe9172f6
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgext/histedit.py
View File

@ -602,7 +602,7 @@ class edit(histeditaction):
def run(self):
repo = self.repo
rulectx = repo[self.node]
hg.update(repo, self.state.parentctxnode)
hg.update(repo, self.state.parentctxnode, quietempty=True)
applychanges(repo.ui, repo, rulectx, {})
raise error.InterventionRequired(
_('Make changes as needed, you may commit or record as needed '

2
tests/test-histedit-no-change.t
View File

@ -146,7 +146,6 @@ check state of working copy
When you are finished, run hg histedit --continue to resume.
$ continueediting true "(leaving commit message unaltered)"
% finalize changeset editing (leaving commit message unaltered)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Make changes as needed, you may commit or record as needed now.
When you are finished, run hg histedit --continue to resume.
$ graphlog "log after first edit"
@ -212,7 +211,6 @@ aborting and not changing files can skip mentioning updating (no) files
$ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets
% start editing the history (not changing anything)
| edit 292aec348d9e 6 closebranch
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Make changes as needed, you may commit or record as needed now.
When you are finished, run hg histedit --continue to resume.
$ hg histedit --abort