mercurial-source: tests/test-histedit-fold.t annotate

annotate tests/test-histedit-fold.t @ 20859:e259d4c462b5 stable

tests: use TESTTMP instead of TESTDIR In 57d0c8c3b947, f042d4b263f4, 1e686e55780c, and 5d22cadd1938, new tests were added that used TESTDIR instead of TESTTMP thereby leading to polluting the working directory with these temporary files. Now, we use TESTTMP so that they will be cleaned up properly.

author	Sean Farley <sean.michael.farley@gmail.com>
date	Fri, 28 Mar 2014 14:33:27 -0500
parents	5d22cadd1938
children	7731a2281cf0

rev	line source
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	1 Test histedit extention: Fold commands
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	2 ======================================
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	3
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	4 This test file is dedicated to testing the fold command in non conflicting
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	5 case.
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	6
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	7 Initialization
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	8 ---------------
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	9
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	10
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	11 $ . "$TESTDIR/histedit-helpers.sh"
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	12
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	13 $ cat >> $HGRCPATH <<EOF
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	14 > [alias]
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	15 > logt = log --template '{rev}:{node\|short} {desc\|firstline}\n'
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	16 > [extensions]
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	17 > histedit=
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	18 > EOF
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	19
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	20
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	21 Simple folding
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	22 --------------------
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	23 $ initrepo ()
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	24 > {
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	25 > hg init r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	26 > cd r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	27 > for x in a b c d e f ; do
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	28 > echo $x > $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	29 > hg add $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	30 > hg ci -m $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	31 > done
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	32 > }
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	33
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	34 $ initrepo
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	35
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	36 log before edit
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	37 $ hg logt --graph
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	38 @ 5:652413bf663e f
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	39 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	40 o 4:e860deea161a e
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	41 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	42 o 3:055a42cdd887 d
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	43 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	44 o 2:177f92b77385 c
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	45 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	46 o 1:d2ae7f538514 b
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	47 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	48 o 0:cb9a9f314b8b a
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	49
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	50
19018 730614b9b352 histedit: allow "-" as a command file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19017 diff changeset	51 $ hg histedit 177f92b77385 --commands - 2>&1 <<EOF \| fixbundle
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	52 > pick e860deea161a e
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	53 > pick 652413bf663e f
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	54 > fold 177f92b77385 c
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	55 > pick 055a42cdd887 d
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	56 > EOF
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	57 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	58 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	59 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	60 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	61 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	62 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	63 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	64
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	65 log after edit
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	66 $ hg logt --graph
19018 730614b9b352 histedit: allow "-" as a command file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19017 diff changeset	67 @ 4:9c277da72c9b d
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	68 \|
19018 730614b9b352 histedit: allow "-" as a command file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19017 diff changeset	69 o 3:6de59d13424a f
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	70 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	71 o 2:ee283cb5f2d5 e
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	72 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	73 o 1:d2ae7f538514 b
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	74 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	75 o 0:cb9a9f314b8b a
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	76
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	77
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	78 post-fold manifest
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	79 $ hg manifest
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	80 a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	81 b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	82 c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	83 d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	84 e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	85 f
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	86
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	87
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	88 check histedit_source
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	89
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	90 $ hg log --debug --rev 3
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	91 changeset: 3:6de59d13424a8a13acd3e975514aed29dd0d9b2d
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	92 phase: draft
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	93 parent: 2:ee283cb5f2d5955443f23a27b697a04339e9a39a
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	94 parent: -1:0000000000000000000000000000000000000000
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	95 manifest: 3:81eede616954057198ead0b2c73b41d1f392829a
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	96 user: test
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	97 date: Thu Jan 01 00:00:00 1970 +0000
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	98 files+: c f
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	99 extra: branch=default
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	100 extra: histedit_source=a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3,177f92b773850b59254aa5e923436f921b55483b
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	101 description:
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	102 f
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	103 ***
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	104 c
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	105
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	106
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	107
20770 5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	108 check saving last-message.txt
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	109
20859 e259d4c462b5 tests: use TESTTMP instead of TESTDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20770 diff changeset	110 $ cat > $TESTTMP/abortfolding.py <<EOF
20770 5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	111 > from mercurial import util
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	112 > def abortfolding(ui, repo, hooktype, **kwargs):
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	113 > ctx = repo[kwargs.get('node')]
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	114 > if set(ctx.files()) == set(['c', 'd', 'f']):
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	115 > return True # abort folding commit only
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	116 > ui.warn('allow non-folding commit\\n')
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	117 > EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	118 $ cat > .hg/hgrc <<EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	119 > [hooks]
20859 e259d4c462b5 tests: use TESTTMP instead of TESTDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20770 diff changeset	120 > pretxncommit.abortfolding = python:$TESTTMP/abortfolding.py:abortfolding
20770 5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	121 > EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	122
20859 e259d4c462b5 tests: use TESTTMP instead of TESTDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20770 diff changeset	123 $ cat > $TESTTMP/editor.sh << EOF
20770 5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	124 > echo "==== before editing"
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	125 > cat \$1
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	126 > echo "===="
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	127 > echo "check saving last-message.txt" >> \$1
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	128 > EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	129
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	130 $ rm -f .hg/last-message.txt
20859 e259d4c462b5 tests: use TESTTMP instead of TESTDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20770 diff changeset	131 $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit 6de59d13424a --commands - 2>&1 <<EOF \| fixbundle
20770 5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	132 > pick 6de59d13424a f
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	133 > fold 9c277da72c9b d
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	134 > EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	135 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	136 allow non-folding commit
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	137 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	138 ==== before editing
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	139 f
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	140 ***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	141 c
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	142 ***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	143 d
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	144
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	145
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	146
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	147 HG: Enter commit message. Lines beginning with 'HG:' are removed.
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	148 HG: Leave message empty to abort commit.
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	149 HG: --
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	150 HG: user: test
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	151 HG: branch 'default'
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	152 HG: changed c
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	153 HG: changed d
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	154 HG: changed f
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	155 ====
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	156 transaction abort!
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	157 rollback completed
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	158 abort: pretxncommit.abortfolding hook failed
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	159
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	160 $ cat .hg/last-message.txt
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	161 f
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	162 ***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	163 c
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	164 ***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	165 d
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	166
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	167
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	168
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	169 check saving last-message.txt
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	170
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	171 $ cd ..
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	172
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	173 folding and creating no new change doesn't break:
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	174 -------------------------------------------------
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	175
19016 27ec54f2946e histedit-test: replace obscure python script by a plain file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19015 diff changeset	176 folded content is dropped during a merge. The folded commit should properly disapear.
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	177
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	178 $ mkdir fold-to-empty-test
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	179 $ cd fold-to-empty-test
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	180 $ hg init
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	181 $ printf "1\n2\n3\n" > file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	182 $ hg add file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	183 $ hg commit -m '1+2+3'
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	184 $ echo 4 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	185 $ hg commit -m '+4'
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	186 $ echo 5 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	187 $ hg commit -m '+5'
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	188 $ echo 6 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	189 $ hg commit -m '+6'
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	190 $ hg logt --graph
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	191 @ 3:251d831eeec5 +6
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	192 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	193 o 2:888f9082bf99 +5
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	194 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	195 o 1:617f94f13c0f +4
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	196 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	197 o 0:0189ba417d34 1+2+3
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	198
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	199
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	200 $ hg histedit 1 --commands - << EOF
19016 27ec54f2946e histedit-test: replace obscure python script by a plain file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19015 diff changeset	201 > pick 617f94f13c0f 1 +4
27ec54f2946e histedit-test: replace obscure python script by a plain file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19015 diff changeset	202 > drop 888f9082bf99 2 +5
19017 c5c8613f265e histedit: properly handle --continue on empty fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19016 diff changeset	203 > fold 251d831eeec5 3 +6
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	204 > EOF
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	205 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	206 merging file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	207 warning: conflicts during merge.
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	208 merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
18934 93f3a06b2035 histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc) Augie Fackler <raf@durin42.com> parents: 18642 diff changeset	209 Fix up the change and run hg histedit --continue
18935 e5d9441ec281 dispatch: exit with status 1 for an InterventionRequired exception (bc) Augie Fackler <raf@durin42.com> parents: 18934 diff changeset	210 [1]
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	211 There were conflicts, we keep P1 content. This
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	212 should effectively drop the changes from +6.
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	213 $ hg status
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	214 M file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	215 ? file.orig
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	216 $ hg resolve -l
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	217 U file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	218 $ hg revert -r 'p1()' file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	219 $ hg resolve --mark file
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	220 $ hg histedit --continue
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	221 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	222 saved backup bundle to $TESTTMP/*-backup.hg (glob)
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	223 $ hg logt --graph
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	224 @ 1:617f94f13c0f +4
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	225 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	226 o 0:0189ba417d34 1+2+3
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	227
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	228
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	229 $ cd ..
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	230
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	231
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	232 Test fold through dropped
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	233 -------------------------
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	234
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	235
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	236 Test corner case where folded revision is separated from its parent by a
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	237 dropped revision.
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	238
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	239
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	240 $ hg init fold-with-dropped
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	241 $ cd fold-with-dropped
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	242 $ printf "1\n2\n3\n" > file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	243 $ hg commit -Am '1+2+3'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	244 adding file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	245 $ echo 4 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	246 $ hg commit -m '+4'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	247 $ echo 5 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	248 $ hg commit -m '+5'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	249 $ echo 6 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	250 $ hg commit -m '+6'
19391 347ccd936fa6 test-histedit-fold: remove unnecessary --template Martin Geisler <martin@geisler.net> parents: 19019 diff changeset	251 $ hg logt -G
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	252 @ 3:251d831eeec5 +6
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	253 \|
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	254 o 2:888f9082bf99 +5
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	255 \|
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	256 o 1:617f94f13c0f +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	257 \|
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	258 o 0:0189ba417d34 1+2+3
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	259
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	260 $ hg histedit 1 --commands - << EOF
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	261 > pick 617f94f13c0f 1 +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	262 > drop 888f9082bf99 2 +5
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	263 > fold 251d831eeec5 3 +6
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	264 > EOF
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	265 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	266 merging file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	267 warning: conflicts during merge.
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	268 merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
18934 93f3a06b2035 histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc) Augie Fackler <raf@durin42.com> parents: 18642 diff changeset	269 Fix up the change and run hg histedit --continue
18935 e5d9441ec281 dispatch: exit with status 1 for an InterventionRequired exception (bc) Augie Fackler <raf@durin42.com> parents: 18934 diff changeset	270 [1]
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	271 $ cat > file << EOF
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	272 > 1
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	273 > 2
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	274 > 3
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	275 > 4
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	276 > 5
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	277 > EOF
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	278 $ hg resolve --mark file
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19479 diff changeset	279 $ hg commit -m '+5.2'
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	280 created new head
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	281 $ echo 6 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	282 $ HGEDITOR=cat hg histedit --continue
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	283 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	284 +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	285 ***
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	286 +5.2
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	287 ***
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	288 +6
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	289
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	290
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	291
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	292 HG: Enter commit message. Lines beginning with 'HG:' are removed.
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	293 HG: Leave message empty to abort commit.
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	294 HG: --
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	295 HG: user: test
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	296 HG: branch 'default'
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	297 HG: changed file
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	298 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	299 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	300 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	301 $ hg logt -G
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	302 @ 1:10c647b2cdd5 +4
17686 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	303 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	304 o 0:0189ba417d34 1+2+3
17686 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	305
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	306 $ hg export tip
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	307 # HG changeset patch
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	308 # User test
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	309 # Date 0 0
18642 76b69cccb07a export: show 'Date' header in a format that also is readable for humans Mads Kiilerich <mads@kiilerich.com> parents: 18437 diff changeset	310 # Thu Jan 01 00:00:00 1970 +0000
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	311 # Node ID 10c647b2cdd54db0603ecb99b2ff5ce66d5a5323
17686 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	312 # Parent 0189ba417d34df9dda55f88b637dcae9917b5964
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	313 +4
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	314 ***
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	315 +5.2
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	316 ***
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	317 +6
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	318
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	319 diff -r 0189ba417d34 -r 10c647b2cdd5 file
17686 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	320 --- a/file Thu Jan 01 00:00:00 1970 +0000
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	321 +++ b/file Thu Jan 01 00:00:00 1970 +0000
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	322 @@ -1,3 +1,6 @@
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	323 1
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	324 2
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	325 3
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	326 +4
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	327 +5
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	328 +6
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	329 $ cd ..
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	330
19392 f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	331
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	332 Folding with initial rename (issue3729)
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	333 ---------------------------------------
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	334
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	335 $ hg init fold-rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	336 $ cd fold-rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	337 $ echo a > a.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	338 $ hg add a.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	339 $ hg commit -m a
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	340 $ hg rename a.txt b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	341 $ hg commit -m rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	342 $ echo b >> b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	343 $ hg commit -m b
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	344
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	345 $ hg logt --follow b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	346 2:e0371e0426bc b
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	347 1:1c4f440a8085 rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	348 0:6c795aa153cb a
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	349
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	350 $ hg histedit 1c4f440a8085 --commands - 2>&1 << EOF \| fixbundle
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	351 > pick 1c4f440a8085 rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	352 > fold e0371e0426bc b
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	353 > EOF
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	354 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	355 reverting b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	356 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	357 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	358 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	359
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	360 $ hg logt --follow b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	361 1:cf858d235c76 rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	362 0:6c795aa153cb a
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	363
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	364 $ cd ..

Mercurial > hg > mercurial-source

annotate tests/test-histedit-fold.t @ 20859:e259d4c462b5 stable