histedit: omit useless message from update (_histedit)
specifically:
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/hgext/histedit.py Mon Dec 14 21:43:16 2015 +0000
+++ b/hgext/histedit.py Mon Dec 14 22:37:31 2015 +0000
@@ -1081,7 +1081,7 @@
state.replacements.extend(replacement_)
state.write()
- hg.update(repo, state.parentctxnode)
+ hg.update(repo, state.parentctxnode, quietempty=True)
mapping, tmpnodes, created, ntm = processreplacement(state)
if mapping:
--- a/tests/test-histedit-arguments.t Mon Dec 14 21:43:16 2015 +0000
+++ b/tests/test-histedit-arguments.t Mon Dec 14 22:37:31 2015 +0000
@@ -71,7 +71,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Run on a revision not ancestors of the current working directory.
--------------------------------------------------------------------
@@ -92,7 +91,6 @@
> pick c8e68270e35a 3 four
> pick 08d98a8350f3 4 five
> EOF
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up --quiet
$ HGEDITOR=cat hg histedit 'tip:2' --commands - << EOF
@@ -100,7 +98,6 @@
> pick c8e68270e35a 3 four
> pick 08d98a8350f3 4 five
> EOF
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up --quiet
Test config specified default
@@ -110,7 +107,6 @@
> pick c8e68270e35a 3 four
> pick 08d98a8350f3 4 five
> EOF
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Run on a revision not descendants of the initial parent
--------------------------------------------------------------------
@@ -142,7 +138,6 @@
$ mv .hg/histedit-state.back .hg/histedit-state
$ hg histedit --continue
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-backup.hg (glob)
$ hg log -G -T '{rev} {shortest(node)} {desc}\n' -r 2::
@ 4 f5ed five
@@ -251,7 +246,6 @@
HG: branch 'default'
HG: changed alpha
1 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/foo/.hg/strip-backup/*-backup.hg (glob)
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob)
@@ -295,7 +289,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test --continue with --keep
@@ -426,7 +419,6 @@
> pick 463b8c0d2973
> pick 8cdc02b9bc63
> EOF
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Default base revision should stop at branchpoint
@@ -435,7 +427,6 @@
> pick 931820154288
> pick 4c35cdf97d5e
> EOF
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Default base revision should stop at merge commit
@@ -444,4 +435,3 @@
> pick 6f2f0241f119
> pick 8cde254db839
> EOF
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-histedit-base.t Mon Dec 14 21:43:16 2015 +0000
+++ b/tests/test-histedit-base.t Mon Dec 14 22:37:31 2015 +0000
@@ -54,7 +54,6 @@
> pick 5fddd98957c8 C
> pick 32af7686d403 D
> EOF
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tglog
@ 7:0937e82309df47d14176ee15e45dbec5fbdef340:draft 'D'
@@ -80,7 +79,6 @@
> drop f778d1cbddac C
> pick 0937e82309df D
> EOF
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tglog
@ 6:476cc3e4168da2d036b141f7f7dcff7f8e3fe846:draft 'D'
@@ -104,7 +102,6 @@
> base cd010b8cd998
> pick 476cc3e4168d D
> EOF
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tglog
@ 6:d7a6f907a822c4ce6f15662ae45a42aa46d3818a:draft 'D'
@@ -182,7 +179,6 @@
$ hg resolve --mark B
(no more unresolved files)
$ hg histedit --continue | fixbundle
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tglog
@ 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X'
|
--- a/tests/test-histedit-bookmark-motion.t Mon Dec 14 21:43:16 2015 +0000
+++ b/tests/test-histedit-bookmark-motion.t Mon Dec 14 22:37:31 2015 +0000
@@ -77,7 +77,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg histedit 1 --commands - --verbose << EOF | grep histedit
> pick 177f92b77385 2 c
> drop d2ae7f538514 1 b
@@ -138,7 +137,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg histedit 1 --commands - --verbose << EOF | grep histedit
> pick b346ab9a313d 1 c
> pick cacdfd884a93 3 f
--- a/tests/test-histedit-commute.t Mon Dec 14 21:43:16 2015 +0000
+++ b/tests/test-histedit-commute.t Mon Dec 14 22:37:31 2015 +0000
@@ -71,7 +71,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
edit the history
(use a hacky editor to check histedit-last-edit.txt backup)
@@ -85,7 +84,6 @@
> EOF
$ 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
rules should end up in .hg/histedit-last-edit.txt:
$ cat .hg/histedit-last-edit.txt
@@ -137,7 +135,6 @@
> pick 8ade9693061e f
> 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
$ hg log --graph
@ changeset: 5:7eca9b5b1148
@@ -181,7 +178,6 @@
> pick 177f92b77385 c
> 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
$ hg log --graph
@ changeset: 5:38b92f448761
| tag: tip
@@ -223,7 +219,6 @@
> pick de71b079d9ce e
> 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
$ hg log --graph
@ changeset: 7:803ef1c6fcfd
| tag: tip
@@ -341,7 +336,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
should also work if a commit message is missing
$ BUNDLE="$TESTDIR/missing-comment.hg"
@@ -372,7 +366,6 @@
summary: Checked in text file
$ hg histedit 0
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
$ cd ..
@@ -413,7 +406,6 @@
removing initial-dir/initial-file (glob)
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
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 21:43:16 2015 +0000
+++ b/tests/test-histedit-drop.t Mon Dec 14 22:37:31 2015 +0000
@@ -60,7 +60,6 @@
> 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
log after edit
$ hg log --graph
--- a/tests/test-histedit-edit.t Mon Dec 14 21:43:16 2015 +0000
+++ b/tests/test-histedit-edit.t Mon Dec 14 22:37:31 2015 +0000
@@ -141,7 +141,6 @@
(use 'hg histedit --continue' or 'hg histedit --abort')
[255]
$ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log --graph
@ changeset: 6:b5f70786f9b0
@@ -261,7 +260,6 @@
HG: user: test
HG: branch 'default'
HG: added f
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-c28d9c86-backup.hg (glob)
$ hg status
@@ -282,7 +280,6 @@
> EOF
$ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg status
$ hg log --limit 1
changeset: 6:1fd3b2fe7754
@@ -405,7 +402,6 @@
> mess 1fd3b2fe7754 f
> EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg status
$ hg log --limit 1
changeset: 6:62feedb1200e
@@ -433,7 +429,6 @@
When you are finished, run hg histedit --continue to resume.
[1]
$ HGEDITOR=true hg histedit --continue
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-backup.hg (glob)
$ hg log -G
--- a/tests/test-histedit-fold-non-commute.t Mon Dec 14 21:43:16 2015 +0000
+++ b/tests/test-histedit-fold-non-commute.t Mon Dec 14 22:37:31 2015 +0000
@@ -130,7 +130,6 @@
(no more unresolved files)
$ hg histedit --continue 2>&1 | fixbundle
7b4e2f4b7bcd: empty changeset
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
log after edit
$ hg log --graph
@@ -269,7 +268,6 @@
(no more unresolved files)
$ hg histedit --continue 2>&1 | fixbundle
7b4e2f4b7bcd: empty changeset
- 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 21:43:16 2015 +0000
+++ b/tests/test-histedit-fold.t Mon Dec 14 22:37:31 2015 +0000
@@ -57,7 +57,6 @@
0 files updated, 0 files merged, 4 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
log after edit
$ hg logt --graph
@@ -115,7 +114,6 @@
0 files updated, 0 files merged, 4 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
$ HGEDITOR=$OLDHGEDITOR
@@ -243,7 +241,6 @@
0 files updated, 0 files merged, 1 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
tip after edit
$ hg log --rev .
@@ -306,7 +303,6 @@
(no more unresolved files)
$ hg histedit --continue
251d831eeec5: empty changeset
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/*-backup.hg (glob)
$ hg logt --graph
@ 1:617f94f13c0f +4
@@ -384,7 +380,6 @@
HG: branch 'default'
HG: changed file
1 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/fold-with-dropped/.hg/strip-backup/55c8d8dc79ce-4066cd98-backup.hg (glob)
saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-a35700fc-backup.hg (glob)
$ hg logt -G
@@ -444,7 +439,6 @@
reverting b.txt
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg logt --follow b.txt
1:cf858d235c76 rename
@@ -490,7 +484,6 @@
0 files updated, 0 files merged, 3 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
commit 9599899f62c05f4377548c32bf1c9f1a39634b0c
$ hg logt
@@ -536,7 +529,6 @@
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
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg logt
2:e8bedbda72c1 merged foos
1:578c7455730c a
--- a/tests/test-histedit-no-change.t Mon Dec 14 21:43:16 2015 +0000
+++ b/tests/test-histedit-no-change.t Mon Dec 14 22:37:31 2015 +0000
@@ -95,7 +95,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
check state of working copy
--- a/tests/test-histedit-non-commute.t Mon Dec 14 21:43:16 2015 +0000
+++ b/tests/test-histedit-non-commute.t Mon Dec 14 22:37:31 2015 +0000
@@ -167,7 +167,6 @@
(no more unresolved files)
$ hg histedit --continue 2>&1 | fixbundle
7b4e2f4b7bcd: empty changeset
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
log after edit
$ hg log --graph
@@ -247,7 +246,6 @@
(no more unresolved files)
$ hg histedit --continue 2>&1 | fixbundle
7b4e2f4b7bcd: empty changeset
- 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 21:43:16 2015 +0000
+++ b/tests/test-histedit-obsolete.t Mon Dec 14 22:37:31 2015 +0000
@@ -56,7 +56,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg histedit 1 --commands - --verbose <<EOF | grep histedit
> pick 177f92b77385 2 c
> drop d2ae7f538514 1 b
@@ -109,7 +108,6 @@
> pick cacdfd884a93 8 f
> 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
$ hg log --graph
@ 11:c13eb81022ca f
|
@@ -123,7 +121,6 @@
> pick b346ab9a313d 6 c
> pick c13eb81022ca 8 f
> EOF
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -144,7 +141,6 @@
[1]
$ echo c >> c
$ hg histedit --continue
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -r 'unstable()'
11:c13eb81022ca f (no-eol)
@@ -199,7 +195,6 @@
> drop 1b3b05f35ff0 13 h
> 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
$ hg log -G
@ 17:ee6544123ab8 c
|
@@ -290,7 +285,6 @@
[1]
$ echo f >> f
$ hg histedit --continue
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G
@ 24:12925f763c90 (secret) k
|
@@ -334,7 +328,6 @@
[1]
$ echo f >> f
$ hg histedit --continue
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G
@ 24:12925f763c90 (secret) k
|
@@ -372,7 +365,6 @@
> pick 14bda137d5b3 16 k
> 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
$ hg log -G
@ 23:9e712162b2c1 (secret) k
|
@@ -421,7 +413,6 @@
2 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
$ hg log -G
@ 27:769e8ee8708e (secret) i
|
--- a/tests/test-histedit-outgoing.t Mon Dec 14 21:43:16 2015 +0000
+++ b/tests/test-histedit-outgoing.t Mon Dec 14 22:37:31 2015 +0000
@@ -53,7 +53,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
show the error from unrelated repos
@@ -85,7 +84,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
test sensitivity to branch in URL:
@@ -109,7 +107,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
test to check number of roots in outgoing revisions