mercurial: tests/test-histedit-fold.t@6a3e38a173ec (annotated)

21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20859 diff changeset	1	Test histedit extension: Fold commands
19015 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
17085 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
17085 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'
17085 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	--------------------
17085 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
17085 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
17085 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
17085 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
17085 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
17085 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
17085 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
17085 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
17085 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: 17257 diff changeset	61	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
17085 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
17085 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
17085 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
17085 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
17085 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
17085 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
17085 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
17085 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: 17687 diff changeset	87
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	88	check histedit_source
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	89
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 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: 17687 diff changeset	92	phase: draft
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	93	parent: 2:ee283cb5f2d5955443f23a27b697a04339e9a39a
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	94	parent: -1:0000000000000000000000000000000000000000
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	95	manifest: 3:81eede616954057198ead0b2c73b41d1f392829a
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	96	user: test
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 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: 17687 diff changeset	98	files+: c f
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	99	extra: branch=default
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	100	extra: histedit_source=a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3,177f92b773850b59254aa5e923436f921b55483b
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 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: 17687 diff changeset	105
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	106
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	107
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	108	rollup will fold without preserving the folded commit's message
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	109
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	110	$ hg histedit d2ae7f538514 --commands - 2>&1 <<EOF \| fixbundle
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	111	> pick d2ae7f538514 b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	112	> roll ee283cb5f2d5 e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	113	> pick 6de59d13424a f
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	114	> pick 9c277da72c9b d
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	115	> EOF
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	116	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	117	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	118	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	119	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	120	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	121	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	122
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	123	log after edit
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	124	$ hg logt --graph
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	125	@ 3:c4a9eb7989fc d
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	126	\|
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	127	o 2:8e03a72b6f83 f
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	128	\|
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	129	o 1:391ee782c689 b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	130	\|
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	131	o 0:cb9a9f314b8b a
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	132
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	133
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	134	description is taken from rollup target commit
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	135
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	136	$ hg log --debug --rev 1
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	137	changeset: 1:391ee782c68930be438ccf4c6a403daedbfbffa5
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	138	phase: draft
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	139	parent: 0:cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	140	parent: -1:0000000000000000000000000000000000000000
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	141	manifest: 1:b5e112a3a8354e269b1524729f0918662d847c38
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	142	user: test
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	143	date: Thu Jan 01 00:00:00 1970 +0000
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	144	files+: b e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	145	extra: branch=default
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	146	extra: histedit_source=d2ae7f538514cd87c17547b0de4cea71fe1af9fb,ee283cb5f2d5955443f23a27b697a04339e9a39a
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	147	description:
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	148	b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	149
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	150
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	151
20770 5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	152	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	153
20859 e259d4c462b5 tests: use TESTTMP instead of TESTDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20770 diff changeset	154	$ 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	155	> 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	156	> 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	157	> 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	158	> 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	159	> 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	160	> 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	161	> EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	162	$ 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	163	> [hooks]
20859 e259d4c462b5 tests: use TESTTMP instead of TESTDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20770 diff changeset	164	> 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	165	> EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	166
20859 e259d4c462b5 tests: use TESTTMP instead of TESTDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20770 diff changeset	167	$ 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	168	> 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	169	> 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	170	> echo "===="
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	171	> 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	172	> EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	173
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	174	$ rm -f .hg/last-message.txt
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	175	$ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit 8e03a72b6f83 --commands - 2>&1 <<EOF \| fixbundle
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	176	> pick 8e03a72b6f83 f
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	177	> fold c4a9eb7989fc d
20770 5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	178	> EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	179	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	180	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	181	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	182	==== 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	183	f
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	184	***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	185	c
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	186	***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	187	d
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	188
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	189
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	190
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	191	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	192	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	193	HG: --
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	194	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	195	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	196	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	197	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	198	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	199	====
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	200	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	201	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	202	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	203
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	204	$ 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	205	f
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	206	***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	207	c
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	208	***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	209	d
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	210
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	211
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	212
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	213	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	214
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	215	$ cd ..
22147 9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	216	$ rm -r r
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	217
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	218	folding preserves initial author
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	219	--------------------------------
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	220
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	221	$ initrepo
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	222
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	223	$ hg ci --user "someone else" --amend --quiet
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	224
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	225	tip before edit
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	226	$ hg log --rev .
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	227	changeset: 5:a00ad806cb55
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	228	tag: tip
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	229	user: someone else
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	230	date: Thu Jan 01 00:00:00 1970 +0000
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	231	summary: f
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	232
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	233
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	234	$ hg histedit e860deea161a --commands - 2>&1 <<EOF \| fixbundle
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	235	> pick e860deea161a e
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	236	> fold a00ad806cb55 f
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	237	> EOF
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	238	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	239	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	240	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	241	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	242
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	243	tip after edit
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	244	$ hg log --rev .
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	245	changeset: 4:698d4e8040a1
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	246	tag: tip
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	247	user: test
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	248	date: Thu Jan 01 00:00:00 1970 +0000
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	249	summary: e
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	250
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	251
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	252	$ cd ..
9ac98c2aa95c histedit: preserve initial author on fold (issue4296) Martin von Zweigbergk <martinvonz@gmail.com> parents: 21947 diff changeset	253	$ rm -r r
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	254
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	255	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	256	-------------------------------------------------
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	257
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20859 diff changeset	258	folded content is dropped during a merge. The folded commit should properly disappear.
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	259
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	260	$ 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: 17087 diff changeset	261	$ 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: 17087 diff changeset	262	$ hg init
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	263	$ 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: 17087 diff changeset	264	$ hg add file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	265	$ 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: 17087 diff changeset	266	$ echo 4 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	267	$ 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: 17087 diff changeset	268	$ echo 5 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	269	$ 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: 17087 diff changeset	270	$ echo 6 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	271	$ 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	272	$ 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	273	@ 3:251d831eeec5 +6
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	274	\|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	275	o 2:888f9082bf99 +5
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	276	\|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	277	o 1:617f94f13c0f +4
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	278	\|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	279	o 0:0189ba417d34 1+2+3
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	280
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	281
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	282	$ 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	283	> 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	284	> 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	285	> fold 251d831eeec5 3 +6
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	286	> EOF
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	287	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	288	merging file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	289	warning: conflicts during merge.
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	290	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: 18648 diff changeset	291	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	292	[1]
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	293	There were conflicts, we keep P1 content. This
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	294	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: 17087 diff changeset	295	$ hg status
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	296	M file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	297	? file.orig
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	298	$ hg resolve -l
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	299	U file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	300	$ 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	301	$ hg resolve --mark file
21947 b081decd9062 resolve: add parenthesis around "no more unresolved files" message Pierre-Yves David <pierre-yves.david@fb.com> parents: 21267 diff changeset	302	(no more unresolved files)
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	303	$ hg histedit --continue
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	304	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: 17087 diff changeset	305	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	306	$ 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	307	@ 1:617f94f13c0f +4
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	308	\|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	309	o 0:0189ba417d34 1+2+3
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	310
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	311
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17087 diff changeset	312	$ cd ..
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	313
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	314
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	315	Test fold through dropped
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	316	-------------------------
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	317
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	318
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	319	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: 17130 diff changeset	320	dropped revision.
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	321
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	322
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	323	$ hg init fold-with-dropped
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	324	$ cd fold-with-dropped
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	325	$ printf "1\n2\n3\n" > file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	326	$ hg commit -Am '1+2+3'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	327	adding file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	328	$ echo 4 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	329	$ hg commit -m '+4'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	330	$ echo 5 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	331	$ hg commit -m '+5'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	332	$ echo 6 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	333	$ hg commit -m '+6'
19391 347ccd936fa6 test-histedit-fold: remove unnecessary --template Martin Geisler <martin@geisler.net> parents: 19019 diff changeset	334	$ hg logt -G
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	335	@ 3:251d831eeec5 +6
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	336	\|
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	337	o 2:888f9082bf99 +5
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	338	\|
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	339	o 1:617f94f13c0f +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	340	\|
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	341	o 0:0189ba417d34 1+2+3
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	342
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	343	$ hg histedit 1 --commands - << EOF
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	344	> pick 617f94f13c0f 1 +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	345	> drop 888f9082bf99 2 +5
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	346	> fold 251d831eeec5 3 +6
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	347	> EOF
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	348	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	349	merging file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	350	warning: conflicts during merge.
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	351	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: 18648 diff changeset	352	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	353	[1]
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	354	$ cat > file << EOF
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	355	> 1
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	356	> 2
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	357	> 3
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	358	> 4
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	359	> 5
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	360	> EOF
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	361	$ hg resolve --mark file
21947 b081decd9062 resolve: add parenthesis around "no more unresolved files" message Pierre-Yves David <pierre-yves.david@fb.com> parents: 21267 diff changeset	362	(no more unresolved files)
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19479 diff changeset	363	$ hg commit -m '+5.2'
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	364	created new head
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	365	$ echo 6 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	366	$ HGEDITOR=cat hg histedit --continue
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	367	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: 17130 diff changeset	368	+4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	369	***
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	370	+5.2
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	371	***
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	372	+6
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17257 diff changeset	373
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17257 diff changeset	374
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17257 diff changeset	375
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17257 diff changeset	376	HG: Enter commit message. Lines beginning with 'HG:' are removed.
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17257 diff changeset	377	HG: Leave message empty to abort commit.
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17257 diff changeset	378	HG: --
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17257 diff changeset	379	HG: user: test
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17257 diff changeset	380	HG: branch 'default'
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17257 diff changeset	381	HG: changed file
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17257 diff changeset	382	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: 17130 diff changeset	383	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: 17130 diff changeset	384	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	385	$ 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	386	@ 1:10c647b2cdd5 +4
17687 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	387	\|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	388	o 0:0189ba417d34 1+2+3
17687 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	389
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	390	$ hg export tip
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	391	# HG changeset patch
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	392	# User test
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	393	# Date 0 0
18648 76b69cccb07a export: show 'Date' header in a format that also is readable for humans Mads Kiilerich <mads@kiilerich.com> parents: 18437 diff changeset	394	# Thu Jan 01 00:00:00 1970 +0000
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	395	# Node ID 10c647b2cdd54db0603ecb99b2ff5ce66d5a5323
17687 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	396	# Parent 0189ba417d34df9dda55f88b637dcae9917b5964
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	397	+4
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	398	***
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	399	+5.2
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	400	***
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	401	+6
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	402
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17687 diff changeset	403	diff -r 0189ba417d34 -r 10c647b2cdd5 file
17687 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	404	--- 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	405	+++ 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	406	@@ -1,3 +1,6 @@
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	407	1
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	408	2
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	409	3
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	410	+4
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	411	+5
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	412	+6
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	413	$ cd ..
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17130 diff changeset	414
19392 f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	415
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	416	Folding with initial rename (issue3729)
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	417	---------------------------------------
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	418
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	419	$ hg init fold-rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	420	$ cd fold-rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	421	$ echo a > a.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	422	$ hg add a.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	423	$ hg commit -m a
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	424	$ 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	425	$ hg commit -m rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	426	$ echo b >> b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	427	$ hg commit -m b
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	428
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	429	$ hg logt --follow b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	430	2:e0371e0426bc b
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	431	1:1c4f440a8085 rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	432	0:6c795aa153cb a
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	433
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	434	$ 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	435	> pick 1c4f440a8085 rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	436	> fold e0371e0426bc b
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	437	> EOF
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	438	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	439	reverting b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	440	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	441	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	442	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	443
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	444	$ hg logt --follow b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	445	1:cf858d235c76 rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	446	0:6c795aa153cb a
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	447
f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19391 diff changeset	448	$ cd ..
23129 eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	449
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	450	Folding with swapping
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	451	---------------------
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	452
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	453	This is an excuse to test hook with histedit temporary commit (issue4422)
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	454
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	455
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	456	$ hg init issue4422
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	457	$ cd issue4422
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	458	$ echo a > a.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	459	$ hg add a.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	460	$ hg commit -m a
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	461	$ echo b > b.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	462	$ hg add b.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	463	$ hg commit -m b
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	464	$ echo c > c.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	465	$ hg add c.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	466	$ hg commit -m c
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	467
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	468	$ hg logt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	469	2:a1a953ffb4b0 c
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	470	1:199b6bb90248 b
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	471	0:6c795aa153cb a
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	472
23390 6a3e38a173ec tests: choose the proper environment variable style for the platform Matt Harbison <matt_harbison@yahoo.com> parents: 23129 diff changeset	473	Setup the proper environment variable symbol for the platform, to be subbed
6a3e38a173ec tests: choose the proper environment variable style for the platform Matt Harbison <matt_harbison@yahoo.com> parents: 23129 diff changeset	474	into the hook command.
6a3e38a173ec tests: choose the proper environment variable style for the platform Matt Harbison <matt_harbison@yahoo.com> parents: 23129 diff changeset	475	#if windows
6a3e38a173ec tests: choose the proper environment variable style for the platform Matt Harbison <matt_harbison@yahoo.com> parents: 23129 diff changeset	476	$ NODE="%HG_NODE%"
6a3e38a173ec tests: choose the proper environment variable style for the platform Matt Harbison <matt_harbison@yahoo.com> parents: 23129 diff changeset	477	#else
6a3e38a173ec tests: choose the proper environment variable style for the platform Matt Harbison <matt_harbison@yahoo.com> parents: 23129 diff changeset	478	$ NODE="\$HG_NODE"
6a3e38a173ec tests: choose the proper environment variable style for the platform Matt Harbison <matt_harbison@yahoo.com> parents: 23129 diff changeset	479	#endif
6a3e38a173ec tests: choose the proper environment variable style for the platform Matt Harbison <matt_harbison@yahoo.com> parents: 23129 diff changeset	480	$ hg histedit 6c795aa153cb --config hooks.commit="echo commit $NODE" --commands - 2>&1 << EOF \| fixbundle
23129 eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	481	> pick 199b6bb90248 b
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	482	> fold a1a953ffb4b0 c
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	483	> pick 6c795aa153cb a
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	484	> EOF
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	485	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	486	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	487	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	488	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	489	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	490	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	491	commit 9599899f62c05f4377548c32bf1c9f1a39634b0c
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	492
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	493	$ hg logt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	494	1:9599899f62c0 a
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	495	0:79b99e9c8e49 b
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	496
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22165 diff changeset	497	$ cd ..

author	Matt Harbison <matt_harbison@yahoo.com>
	Thu, 20 Nov 2014 22:33:40 -0500
changeset 23390	6a3e38a173ec
parent 23129	eb315418224c
child 23587	8063901e56cd
permissions	-rw-r--r--