histedit: omit useless message from update (edit)
authortimeless <timeless@mozdev.org>
Mon, 14 Dec 2015 23:04:17 +0000
changeset 27407 bf4d5d8dc2aa
parent 27406 11be6b7f95da
child 27408 2916ebaef312
histedit: omit useless message from update (edit) specifically: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
hgext/histedit.py
tests/test-histedit-no-change.t
--- a/hgext/histedit.py	Mon Dec 14 22:37:31 2015 +0000
+++ b/hgext/histedit.py	Mon Dec 14 23:04:17 2015 +0000
@@ -602,7 +602,7 @@
     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 '
--- a/tests/test-histedit-no-change.t	Mon Dec 14 22:37:31 2015 +0000
+++ b/tests/test-histedit-no-change.t	Mon Dec 14 23:04:17 2015 +0000
@@ -146,7 +146,6 @@
   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 @@
   $ 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