Mercurial > hg-stable

changeset 27405:5837ca674da9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: omit useless message from update (histeditaction) specifically: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
author timeless <timeless@mozdev.org>
date Mon, 14 Dec 2015 21:43:16 +0000
parents 1cf3543cc780
children 11be6b7f95da
files hgext/histedit.py tests/test-histedit-base.t tests/test-histedit-commute.t tests/test-histedit-drop.t tests/test-histedit-edit.t tests/test-histedit-fold-non-commute.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-histedit-non-commute-abort.t tests/test-histedit-non-commute.t tests/test-histedit-obsolete.t
diffstat 11 files changed, 1 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/histedit.py	Mon Dec 14 23:14:06 2015 +0000
+++ b/hgext/histedit.py	Mon Dec 14 21:43:16 2015 +0000
@@ -409,7 +409,7 @@
         parentctx, but does not commit them."""
         repo = self.repo
         rulectx = repo[self.node]
-        hg.update(repo, self.state.parentctxnode)
+        hg.update(repo, self.state.parentctxnode, quietempty=True)
         stats = applychanges(repo.ui, repo, rulectx, {})
         if stats and stats[3] > 0:
             raise error.InterventionRequired(_('Fix up the change and run '
--- a/tests/test-histedit-base.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-base.t	Mon Dec 14 21:43:16 2015 +0000
@@ -55,9 +55,6 @@
   > pick 32af7686d403 D
   > EOF
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg tglog
   @  7:0937e82309df47d14176ee15e45dbec5fbdef340:draft 'D'
@@ -84,8 +81,6 @@
   > pick 0937e82309df D
   > EOF
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg tglog
   @  6:476cc3e4168da2d036b141f7f7dcff7f8e3fe846:draft 'D'
@@ -110,7 +105,6 @@
   > pick 476cc3e4168d D
   > EOF
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg tglog
   @  6:d7a6f907a822c4ce6f15662ae45a42aa46d3818a:draft 'D'
@@ -153,7 +147,6 @@
   > drop d7a6f907a822 D
   > pick 591369deedfd X
   > EOF
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
@@ -182,7 +175,6 @@
   > drop d7a6f907a822 D
   > pick 591369deedfd X
   > EOF
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
--- a/tests/test-histedit-commute.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-commute.t	Mon Dec 14 21:43:16 2015 +0000
@@ -86,8 +86,6 @@
   $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 rules should end up in .hg/histedit-last-edit.txt:
   $ cat .hg/histedit-last-edit.txt
@@ -140,8 +138,6 @@
   > EOF
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg log --graph
   @  changeset:   5:7eca9b5b1148
@@ -186,9 +182,6 @@
   > EOF
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log --graph
   @  changeset:   5:38b92f448761
   |  tag:         tip
@@ -231,7 +224,6 @@
   > EOF
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log --graph
   @  changeset:   7:803ef1c6fcfd
   |  tag:         tip
@@ -422,7 +414,6 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob)
   saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob)
 
--- a/tests/test-histedit-drop.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-drop.t	Mon Dec 14 21:43:16 2015 +0000
@@ -61,8 +61,6 @@
   > EOF
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 log after edit
   $ hg log --graph
--- a/tests/test-histedit-edit.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-edit.t	Mon Dec 14 21:43:16 2015 +0000
@@ -142,7 +142,6 @@
   [255]
   $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg log --graph
   @  changeset:   6:b5f70786f9b0
--- a/tests/test-histedit-fold-non-commute.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-fold-non-commute.t	Mon Dec 14 21:43:16 2015 +0000
@@ -120,7 +120,6 @@
   
   
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
@@ -132,7 +131,6 @@
   $ hg histedit --continue 2>&1 | fixbundle
   7b4e2f4b7bcd: empty changeset
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 log after edit
   $ hg log --graph
@@ -261,7 +259,6 @@
   $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
@@ -273,7 +270,6 @@
   $ hg histedit --continue 2>&1 | fixbundle
   7b4e2f4b7bcd: empty changeset
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 log after edit
   $ hg log --graph
--- a/tests/test-histedit-fold.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-fold.t	Mon Dec 14 21:43:16 2015 +0000
@@ -55,12 +55,9 @@
   > pick 055a42cdd887 d
   > EOF
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 log after edit
   $ hg logt --graph
@@ -119,8 +116,6 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ HGEDITOR=$OLDHGEDITOR
 
@@ -493,11 +488,9 @@
   > pick 6c795aa153cb a
   > EOF
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   commit 9599899f62c05f4377548c32bf1c9f1a39634b0c
 
   $ hg logt
@@ -540,7 +533,6 @@
   reverting foo
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging foo
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-histedit-no-change.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-no-change.t	Mon Dec 14 21:43:16 2015 +0000
@@ -96,7 +96,6 @@
   $ 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
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 
 check state of working copy
--- a/tests/test-histedit-non-commute-abort.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-non-commute-abort.t	Mon Dec 14 21:43:16 2015 +0000
@@ -70,7 +70,6 @@
   > pick 652413bf663e f
   > EOF
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
--- a/tests/test-histedit-non-commute.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-non-commute.t	Mon Dec 14 21:43:16 2015 +0000
@@ -154,7 +154,6 @@
   $ hg resolve --mark e
   (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
@@ -169,7 +168,6 @@
   $ hg histedit --continue 2>&1 | fixbundle
   7b4e2f4b7bcd: empty changeset
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 log after edit
   $ hg log --graph
@@ -240,7 +238,6 @@
   $ hg resolve --mark e
   (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
@@ -251,7 +248,6 @@
   $ hg histedit --continue 2>&1 | fixbundle
   7b4e2f4b7bcd: empty changeset
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 post message fix
   $ hg log --graph
--- a/tests/test-histedit-obsolete.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-obsolete.t	Mon Dec 14 21:43:16 2015 +0000
@@ -200,7 +200,6 @@
   > EOF
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -G
   @  17:ee6544123ab8 c
   |
@@ -292,11 +291,6 @@
   $ echo f >> f
   $ hg histedit --continue
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -G
   @  24:12925f763c90 (secret) k
   |
@@ -341,11 +335,6 @@
   $ echo f >> f
   $ hg histedit --continue
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -G
   @  24:12925f763c90 (secret) k
   |
@@ -384,10 +373,6 @@
   > EOF
   0 files updated, 0 files merged, 5 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -G
   @  23:9e712162b2c1 (secret) k
   |
@@ -430,15 +415,10 @@
   > fold 14bda137d5b3 16 k
   > EOF
   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved