# HG changeset patch # User timeless # Date 2015-12-14 23:04:17 # Node ID bf4d5d8dc2aa9bc6cd293f273f67e3aada5b465d # Parent 11be6b7f95da33202ebf455c3109c653e8a95e9b histedit: omit useless message from update (edit) specifically: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -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 ' diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t --- a/tests/test-histedit-no-change.t +++ b/tests/test-histedit-no-change.t @@ -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 $ 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