mercurial: tests/test-branches.t@8d14d91584f1 (annotated)

11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	1	$ hg init a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	2	$ cd a
31454 a5bad127128d branchmap: handle nullrev in setcachedata Durham Goode <durham@fb.com> parents: 31173 diff changeset	3
a5bad127128d branchmap: handle nullrev in setcachedata Durham Goode <durham@fb.com> parents: 31173 diff changeset	4	Verify checking branch of nullrev before the cache is created doesnt crash
a5bad127128d branchmap: handle nullrev in setcachedata Durham Goode <durham@fb.com> parents: 31173 diff changeset	5	$ hg log -r 'branch(.)' -T '{branch}\n'
a5bad127128d branchmap: handle nullrev in setcachedata Durham Goode <durham@fb.com> parents: 31173 diff changeset	6
a5bad127128d branchmap: handle nullrev in setcachedata Durham Goode <durham@fb.com> parents: 31173 diff changeset	7	Basic test
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	8	$ echo 'root' >root
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	9	$ hg add root
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	10	$ hg commit -d '0 0' -m "Adding root node"
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	11
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	12	$ echo 'a' >a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	13	$ hg add a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	14	$ hg branch a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	15	marked working directory as branch a
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14162 diff changeset	16	(branches are permanent and global, did you want a bookmark?)
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	17	$ hg commit -d '1 0' -m "Adding a branch"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	18
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	19	$ hg branch q
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	20	marked working directory as branch q
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	21	$ echo 'aa' >a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	22	$ hg branch -C
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	23	reset working directory to branch a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	24	$ hg commit -d '2 0' -m "Adding to a branch"
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	25
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	26	$ hg update -C 0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	27	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	28	$ echo 'b' >b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	29	$ hg add b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	30	$ hg branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	31	marked working directory as branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	32	$ hg commit -d '2 0' -m "Adding b branch"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	33
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	34	$ echo 'bh1' >bh1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	35	$ hg add bh1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	36	$ hg commit -d '3 0' -m "Adding b branch head 1"
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	37
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	38	$ hg update -C 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	39	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	40	$ echo 'bh2' >bh2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	41	$ hg add bh2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	42	$ hg commit -d '4 0' -m "Adding b branch head 2"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	43
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	44	$ echo 'c' >c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	45	$ hg add c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	46	$ hg branch c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	47	marked working directory as branch c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	48	$ hg commit -d '5 0' -m "Adding c branch"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	49
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	50	reserved names
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	51
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	52	$ hg branch tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	53	abort: the name 'tip' is reserved
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11969 diff changeset	54	[255]
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	55	$ hg branch null
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	56	abort: the name 'null' is reserved
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11969 diff changeset	57	[255]
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	58	$ hg branch .
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	59	abort: the name '.' is reserved
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11969 diff changeset	60	[255]
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	61
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	62	invalid characters
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	63
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	64	$ hg branch 'foo:bar'
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17821 diff changeset	65	abort: ':' cannot be used in a name
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	66	[255]
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	67
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	68	$ hg branch 'foo
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	69	> bar'
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17821 diff changeset	70	abort: '\n' cannot be used in a name
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	71	[255]
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 16913 diff changeset	72
19180 12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	73	trailing or leading spaces should be stripped before testing duplicates
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	74
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	75	$ hg branch 'b '
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	76	abort: a branch of the same name already exists
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	77	(use 'hg update' to switch to it)
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	78	[255]
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	79
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	80	$ hg branch ' b'
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	81	abort: a branch of the same name already exists
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	82	(use 'hg update' to switch to it)
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	83	[255]
12dbdd348bb0 branch: strip whitespace before testing known branch name Yuya Nishihara <yuya@tcha.org> parents: 18955 diff changeset	84
17984 b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	85	verify update will accept invalid legacy branch names
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	86
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	87	$ hg init test-invalid-branch-name
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	88	$ cd test-invalid-branch-name
37336 5d10f41ddcc4 tests: use `hg unbundle` instead of `hg pull` in some tests Gregory Szorc <gregory.szorc@gmail.com> parents: 34661 diff changeset	89	$ hg unbundle -u "$TESTDIR"/bundles/test-invalid-branch-name.hg
17984 b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	90	adding changesets
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	91	adding manifests
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	92	adding file changes
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	93	added 3 changesets with 3 changes to 2 files
39480 89630d0b3e23 phase: report number of non-public changeset alongside the new range Boris Feld <boris.feld@octobus.net> parents: 37336 diff changeset	94	new changesets f0e4c7f04036:33c2ceb9310b (3 drafts)
17984 b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	95	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	96
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	97	$ hg update '"colon:test"'
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	98	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	99	$ cd ..
b74361cf7c0a update: allow update to existing branches with invalid names (issue3710) Tim Henigan <tim.henigan@gmail.com> parents: 17850 diff changeset	100
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	101	$ echo 'd' >d
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	102	$ hg add d
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	103	$ hg branch 'a branch name much longer than the default justification used by branches'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	104	marked working directory as branch a branch name much longer than the default justification used by branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	105	$ hg commit -d '6 0' -m "Adding d branch"
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	106
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	107	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	108	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	109	b 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	110	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	111	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	112	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	113
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	114	-------
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	115
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	116	$ hg branches -a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	117	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	118	b 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	119
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	120	--- Branch a
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	121
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	122	$ hg log -b a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	123	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	124	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	125	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	126	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	127	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	128	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	129
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	130	changeset: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	131	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	132	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	133	date: Thu Jan 01 00:00:02 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	134	summary: Adding to a branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	135
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	136	changeset: 1:dd6b440dd85a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	137	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	138	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	139	date: Thu Jan 01 00:00:01 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	140	summary: Adding a branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	141
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	142
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	143	---- Branch b
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	144
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	145	$ hg log -b b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	146	changeset: 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	147	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	148	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	149	date: Thu Jan 01 00:00:03 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	150	summary: Adding b branch head 1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	151
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	152	changeset: 3:ac22033332d1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	153	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	154	parent: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	155	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	156	date: Thu Jan 01 00:00:02 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	157	summary: Adding b branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	158
10417 58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 8991 diff changeset	159
41064 4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	160	---- going to test branch listing by rev
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	161	$ hg branches -r0
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	162	default 0:19709c5a4e75 (inactive)
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	163	$ hg branches -qr0
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	164	default
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	165	--- now more than one rev
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	166	$ hg branches -r2:5
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	167	b 4:aee39cd168d0
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	168	a 5:d8cbc61dbaa6 (inactive)
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	169	$ hg branches -qr2:5
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	170	b
4506f801e492 branches: add -r option to show branch name(s) of a given rev (issue5948) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 39480 diff changeset	171	a
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	172	---- going to test branch closing
6631 a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6067 diff changeset	173
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	174	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	175	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	176	b 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	177	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	178	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	179	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	180	$ hg up -C b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	181	2 files updated, 0 files merged, 4 files removed, 0 files unresolved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	182	$ echo 'xxx1' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	183	$ hg commit -d '7 0' -m 'adding cset to branch b'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	184	$ hg up -C aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	185	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	186	$ echo 'xxx2' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	187	$ hg commit -d '8 0' -m 'adding head to branch b'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	188	created new head
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	189	$ echo 'xxx3' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	190	$ hg commit -d '9 0' -m 'adding another cset to branch b'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	191	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	192	b 10:bfbe841b666e
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	193	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	194	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	195	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	196	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	197	$ hg heads --closed
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	198	changeset: 10:bfbe841b666e
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	199	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	200	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	201	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	202	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	203	summary: adding another cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	204
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	205	changeset: 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	206	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	207	parent: 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	208	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	209	date: Thu Jan 01 00:00:07 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	210	summary: adding cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	211
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	212	changeset: 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	213	branch: a branch name much longer than the default justification used by branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	214	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	215	date: Thu Jan 01 00:00:06 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	216	summary: Adding d branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	217
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	218	changeset: 6:589736a22561
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	219	branch: c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	220	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	221	date: Thu Jan 01 00:00:05 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	222	summary: Adding c branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	223
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	224	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	225	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	226	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	227	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	228	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	229	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	230
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	231	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	232	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	233	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	234	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	235
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	236	$ hg heads
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	237	changeset: 10:bfbe841b666e
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	238	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	239	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	240	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	241	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	242	summary: adding another cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	243
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	244	changeset: 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	245	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	246	parent: 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	247	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	248	date: Thu Jan 01 00:00:07 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	249	summary: adding cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	250
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	251	changeset: 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	252	branch: a branch name much longer than the default justification used by branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	253	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	254	date: Thu Jan 01 00:00:06 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	255	summary: Adding d branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	256
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	257	changeset: 6:589736a22561
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	258	branch: c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	259	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	260	date: Thu Jan 01 00:00:05 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	261	summary: Adding c branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	262
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	263	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	264	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	265	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	266	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	267	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	268	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	269
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	270	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	271	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	272	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	273	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	274
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	275	$ hg commit -d '9 0' --close-branch -m 'prune bad branch'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	276	$ hg branches -a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	277	b 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	278	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	279	$ hg up -C b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	280	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	281	$ hg commit -d '9 0' --close-branch -m 'close this part branch too'
19305 b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 19180 diff changeset	282	$ hg commit -d '9 0' --close-branch -m 're-closing this branch'
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 19180 diff changeset	283	abort: can only close branch heads
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 19180 diff changeset	284	[255]
6067 57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	285
18955 f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	286	$ hg log -r tip --debug
19305 b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 19180 diff changeset	287	changeset: 12:e3d49c0575d8fc2cb1cd6859c747c14f5f6d499f
18955 f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	288	branch: b
f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	289	tag: tip
f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	290	phase: draft
19305 b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 19180 diff changeset	291	parent: 8:eebb944467c9fb9651ed232aeaf31b3c0a7fc6c1
18955 f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	292	parent: -1:0000000000000000000000000000000000000000
f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	293	manifest: 8:6f9ed32d2b310e391a4f107d5f0f071df785bfee
f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	294	user: test
f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	295	date: Thu Jan 01 00:00:09 1970 +0000
f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	296	extra: branch=b
f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	297	extra: close=1
f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	298	description:
19305 b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 19180 diff changeset	299	close this part branch too
18955 f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	300
f3245f22771c commit: allow closing "non-head" changesets Mads Kiilerich <madski@unity3d.com> parents: 17984 diff changeset	301
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	302	--- b branch should be inactive
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	303
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	304	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	305	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	306	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	307	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	308	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	309	$ hg branches -c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	310	a branch name much longer than the default justification used by branches 7:10ff5895aa57
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	311	b 12:e3d49c0575d8 (closed)
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	312	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	313	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	314	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	315	$ hg branches -a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	316	a branch name much longer than the default justification used by branches 7:10ff5895aa57
16612 726dd0fc7cfe branches: quiet option observes other parameters Travis Herrick <tthetoad@gmail.com> parents: 15615 diff changeset	317	$ hg branches -q
726dd0fc7cfe branches: quiet option observes other parameters Travis Herrick <tthetoad@gmail.com> parents: 15615 diff changeset	318	a branch name much longer than the default justification used by branches
726dd0fc7cfe branches: quiet option observes other parameters Travis Herrick <tthetoad@gmail.com> parents: 15615 diff changeset	319	c
726dd0fc7cfe branches: quiet option observes other parameters Travis Herrick <tthetoad@gmail.com> parents: 15615 diff changeset	320	a
726dd0fc7cfe branches: quiet option observes other parameters Travis Herrick <tthetoad@gmail.com> parents: 15615 diff changeset	321	default
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	322	$ hg heads b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	323	no open branch heads found on branches b
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11969 diff changeset	324	[1]
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	325	$ hg heads --closed b
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	326	changeset: 12:e3d49c0575d8
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	327	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	328	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	329	parent: 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	330	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	331	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	332	summary: close this part branch too
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	333
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	334	changeset: 11:d3f163457ebf
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	335	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	336	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	337	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	338	summary: prune bad branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	339
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	340	$ echo 'xxx4' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	341	$ hg commit -d '9 0' -m 'reopen branch with a change'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	342	reopening closed branch head 12
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	343
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	344	--- branch b is back in action
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	345
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	346	$ hg branches -a
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	347	b 13:e23b5505d1ad
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	348	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	349
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	350	---- test heads listings
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	351
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	352	$ hg heads
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	353	changeset: 13:e23b5505d1ad
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	354	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	355	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	356	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	357	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	358	summary: reopen branch with a change
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	359
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	360	changeset: 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	361	branch: a branch name much longer than the default justification used by branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	362	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	363	date: Thu Jan 01 00:00:06 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	364	summary: Adding d branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	365
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	366	changeset: 6:589736a22561
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	367	branch: c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	368	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	369	date: Thu Jan 01 00:00:05 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	370	summary: Adding c branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	371
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	372	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	373	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	374	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	375	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	376	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	377	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	378
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	379	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	380	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	381	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	382	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	383
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	384
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	385	branch default
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	386
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	387	$ hg heads default
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	388	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	389	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	390	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	391	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	392
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	393
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	394	branch a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	395
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	396	$ hg heads a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	397	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	398	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	399	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	400	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	401	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	402	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	403
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	404	$ hg heads --active a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	405	no open branch heads found on branches a
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11969 diff changeset	406	[1]
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	407
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	408	branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	409
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	410	$ hg heads b
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	411	changeset: 13:e23b5505d1ad
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	412	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	413	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	414	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	415	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	416	summary: reopen branch with a change
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	417
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	418	$ hg heads --closed b
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	419	changeset: 13:e23b5505d1ad
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	420	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	421	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	422	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	423	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	424	summary: reopen branch with a change
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	425
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	426	changeset: 11:d3f163457ebf
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	427	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	428	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	429	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	430	summary: prune bad branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	431
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	432
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	433	reclose branch
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	434
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	435	$ hg up -C c
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	436	3 files updated, 0 files merged, 2 files removed, 0 files unresolved
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	437	$ hg commit -d '9 0' --close-branch -m 'reclosing this branch'
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	438	$ hg branches
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	439	b 13:e23b5505d1ad
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	440	a branch name much longer than the default justification used by branches 7:10ff5895aa57
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	441	a 5:d8cbc61dbaa6 (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	442	default 0:19709c5a4e75 (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	443	$ hg branches --closed
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	444	b 13:e23b5505d1ad
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	445	a branch name much longer than the default justification used by branches 7:10ff5895aa57
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	446	c 14:f894c25619d3 (closed)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	447	a 5:d8cbc61dbaa6 (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	448	default 0:19709c5a4e75 (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	449
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	450	multihead branch
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	451
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	452	$ hg up -C default
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	453	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	454	$ hg branch m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	455	marked working directory as branch m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	456	$ touch m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	457	$ hg add m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	458	$ hg commit -d '10 0' -m 'multihead base'
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	459	$ echo "m1" >m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	460	$ hg commit -d '10 0' -m 'head 1'
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	461	$ hg up -C '.^'
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	462	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	463	$ echo "m2" >m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	464	$ hg commit -d '10 0' -m 'head 2'
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	465	created new head
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	466	$ hg log -b m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	467	changeset: 17:df343b0df04f
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	468	branch: m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	469	tag: tip
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	470	parent: 15:f3447637f53e
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	471	user: test
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	472	date: Thu Jan 01 00:00:10 1970 +0000
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	473	summary: head 2
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	474
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	475	changeset: 16:a58ca5d3bdf3
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	476	branch: m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	477	user: test
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	478	date: Thu Jan 01 00:00:10 1970 +0000
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	479	summary: head 1
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	480
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	481	changeset: 15:f3447637f53e
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	482	branch: m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	483	parent: 0:19709c5a4e75
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	484	user: test
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	485	date: Thu Jan 01 00:00:10 1970 +0000
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	486	summary: multihead base
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	487
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	488	$ hg heads --topo m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	489	changeset: 17:df343b0df04f
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	490	branch: m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	491	tag: tip
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	492	parent: 15:f3447637f53e
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	493	user: test
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	494	date: Thu Jan 01 00:00:10 1970 +0000
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	495	summary: head 2
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	496
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	497	changeset: 16:a58ca5d3bdf3
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	498	branch: m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	499	user: test
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	500	date: Thu Jan 01 00:00:10 1970 +0000
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	501	summary: head 1
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	502
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	503	$ hg branches
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	504	m 17:df343b0df04f
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	505	b 13:e23b5505d1ad
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	506	a branch name much longer than the default justification used by branches 7:10ff5895aa57
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	507	a 5:d8cbc61dbaa6 (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	508	default 0:19709c5a4e75 (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	509
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	510	partially merge multihead branch
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	511
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	512	$ hg up -C default
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	513	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	514	$ hg branch md
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	515	marked working directory as branch md
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	516	$ hg merge m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	517	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	518	(branch merge, don't forget to commit)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	519	$ hg commit -d '11 0' -m 'merge head 2'
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	520	$ hg heads --topo m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	521	changeset: 16:a58ca5d3bdf3
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	522	branch: m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	523	user: test
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	524	date: Thu Jan 01 00:00:10 1970 +0000
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	525	summary: head 1
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	526
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	527	$ hg branches
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	528	md 18:c914c99f1fbb
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	529	m 17:df343b0df04f
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	530	b 13:e23b5505d1ad
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	531	a branch name much longer than the default justification used by branches 7:10ff5895aa57
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	532	a 5:d8cbc61dbaa6 (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	533	default 0:19709c5a4e75 (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	534
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	535	partially close multihead branch
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	536
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	537	$ hg up -C a58ca5d3bdf3
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	538	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	539	$ hg commit -d '12 0' -m 'close head 1' --close-branch
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	540	$ hg heads --topo m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	541	changeset: 19:cd21a80baa3d
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	542	branch: m
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	543	tag: tip
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	544	parent: 16:a58ca5d3bdf3
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	545	user: test
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	546	date: Thu Jan 01 00:00:12 1970 +0000
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	547	summary: close head 1
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	548
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	549	$ hg branches
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	550	md 18:c914c99f1fbb
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	551	b 13:e23b5505d1ad
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	552	a branch name much longer than the default justification used by branches 7:10ff5895aa57
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	553	m 17:df343b0df04f (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	554	a 5:d8cbc61dbaa6 (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	555	default 0:19709c5a4e75 (inactive)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	556
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	557	default branch colors:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	558
23172 e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	559	$ cat <<EOF >> $HGRCPATH
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	560	> [extensions]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	561	> color =
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	562	> [color]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	563	> mode = ansi
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	564	> EOF
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	565
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	566	$ hg up -C b
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	567	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	568	$ hg branches --color=always
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	569	\x1b[0;0mmd\x1b[0m\x1b[0;33m 18:c914c99f1fbb\x1b[0m (esc)
22704 386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	570	\x1b[0;32mb\x1b[0m\x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc)
386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	571	\x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;33m 7:10ff5895aa57\x1b[0m (esc)
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	572	\x1b[0;0mm\x1b[0m\x1b[0;33m 17:df343b0df04f\x1b[0m (inactive) (esc)
22704 386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	573	\x1b[0;0ma\x1b[0m\x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc)
386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	574	\x1b[0;0mdefault\x1b[0m\x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc)
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	575
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	576	default closed branch color:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	577
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	578	$ hg branches --color=always --closed
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	579	\x1b[0;0mmd\x1b[0m\x1b[0;33m 18:c914c99f1fbb\x1b[0m (esc)
22704 386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	580	\x1b[0;32mb\x1b[0m\x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc)
386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	581	\x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;33m 7:10ff5895aa57\x1b[0m (esc)
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	582	\x1b[0;0mm\x1b[0m\x1b[0;33m 17:df343b0df04f\x1b[0m (inactive) (esc)
22704 386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	583	\x1b[0;30;1mc\x1b[0m\x1b[0;33m 14:f894c25619d3\x1b[0m (closed) (esc)
386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	584	\x1b[0;0ma\x1b[0m\x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc)
386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	585	\x1b[0;0mdefault\x1b[0m\x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc)
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	586
23172 e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	587	$ cat <<EOF >> $HGRCPATH
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	588	> [extensions]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	589	> color =
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	590	> [color]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	591	> branches.active = green
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	592	> branches.closed = blue
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	593	> branches.current = red
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	594	> branches.inactive = magenta
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	595	> log.changeset = cyan
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22705 diff changeset	596	> EOF
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	597
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	598	custom branch colors:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	599
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	600	$ hg branches --color=always
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	601	\x1b[0;32mmd\x1b[0m\x1b[0;36m 18:c914c99f1fbb\x1b[0m (esc)
22704 386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	602	\x1b[0;31mb\x1b[0m\x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc)
386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	603	\x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;36m 7:10ff5895aa57\x1b[0m (esc)
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	604	\x1b[0;35mm\x1b[0m\x1b[0;36m 17:df343b0df04f\x1b[0m (inactive) (esc)
22704 386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	605	\x1b[0;35ma\x1b[0m\x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc)
386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	606	\x1b[0;35mdefault\x1b[0m\x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc)
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	607
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	608	custom closed branch color:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	609
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	610	$ hg branches --color=always --closed
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	611	\x1b[0;32mmd\x1b[0m\x1b[0;36m 18:c914c99f1fbb\x1b[0m (esc)
22704 386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	612	\x1b[0;31mb\x1b[0m\x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc)
386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	613	\x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;36m 7:10ff5895aa57\x1b[0m (esc)
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	614	\x1b[0;35mm\x1b[0m\x1b[0;36m 17:df343b0df04f\x1b[0m (inactive) (esc)
22704 386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	615	\x1b[0;34mc\x1b[0m\x1b[0;36m 14:f894c25619d3\x1b[0m (closed) (esc)
386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	616	\x1b[0;35ma\x1b[0m\x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc)
386339ffe421 branches: merge white space to format string Yuya Nishihara <yuya@tcha.org> parents: 22703 diff changeset	617	\x1b[0;35mdefault\x1b[0m\x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc)
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16612 diff changeset	618
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	619	template output:
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	620
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	621	$ hg branches -Tjson --closed
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	622	[
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	623	{
22705 d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	624	"active": true,
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	625	"branch": "md",
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	626	"closed": false,
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	627	"current": false,
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	628	"node": "c914c99f1fbb2b1d785a0a939ed3f67275df18e9",
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	629	"rev": 18
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	630	},
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	631	{
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	632	"active": true,
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	633	"branch": "b",
22705 d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	634	"closed": false,
d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	635	"current": true,
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	636	"node": "e23b5505d1ad24aab6f84fd8c7cb8cd8e5e93be0",
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	637	"rev": 13
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	638	},
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	639	{
22705 d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	640	"active": true,
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	641	"branch": "a branch name much longer than the default justification used by branches",
22705 d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	642	"closed": false,
d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	643	"current": false,
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	644	"node": "10ff5895aa5793bd378da574af8cec8ea408d831",
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	645	"rev": 7
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	646	},
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	647	{
22705 d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	648	"active": false,
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	649	"branch": "m",
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	650	"closed": false,
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	651	"current": false,
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	652	"node": "df343b0df04feb2a946cd4b6e9520e552fef14ee",
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	653	"rev": 17
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	654	},
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	655	{
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	656	"active": false,
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	657	"branch": "c",
22705 d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	658	"closed": true,
d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	659	"current": false,
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	660	"node": "f894c25619d3f1484639d81be950e0a07bc6f1f6",
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	661	"rev": 14
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	662	},
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	663	{
22705 d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	664	"active": false,
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	665	"branch": "a",
22705 d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	666	"closed": false,
d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	667	"current": false,
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	668	"node": "d8cbc61dbaa6dc817175d1e301eecb863f280832",
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	669	"rev": 5
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	670	},
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	671	{
22705 d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	672	"active": false,
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	673	"branch": "default",
22705 d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	674	"closed": false,
d4869b280cd6 branches: include active, closed and current flags in template output Yuya Nishihara <yuya@tcha.org> parents: 22704 diff changeset	675	"current": false,
22703 bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	676	"node": "19709c5a4e75bf938f8e349aff97438539bb729e",
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	677	"rev": 0
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	678	}
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	679	]
bd6e95cb82b4 branches: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 19305 diff changeset	680
29816 034412ca28c3 templater: fix if() to not evaluate False as bool('False') Yuya Nishihara <yuya@tcha.org> parents: 29744 diff changeset	681	$ hg branches --closed -T '{if(closed, "{branch}\n")}'
034412ca28c3 templater: fix if() to not evaluate False as bool('False') Yuya Nishihara <yuya@tcha.org> parents: 29744 diff changeset	682	c
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	683
31173 052e4f1ffce9 branches: populate all template keywords in formatter Yuya Nishihara <yuya@tcha.org> parents: 29816 diff changeset	684	$ hg branches -T '{word(0, branch)}: {desc\|firstline}\n'
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	685	md: merge head 2
31173 052e4f1ffce9 branches: populate all template keywords in formatter Yuya Nishihara <yuya@tcha.org> parents: 29816 diff changeset	686	b: reopen branch with a change
052e4f1ffce9 branches: populate all template keywords in formatter Yuya Nishihara <yuya@tcha.org> parents: 29816 diff changeset	687	a: Adding d branch
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	688	m: head 2
31173 052e4f1ffce9 branches: populate all template keywords in formatter Yuya Nishihara <yuya@tcha.org> parents: 29816 diff changeset	689	a: Adding b branch head 2
052e4f1ffce9 branches: populate all template keywords in formatter Yuya Nishihara <yuya@tcha.org> parents: 29816 diff changeset	690	default: Adding root node
052e4f1ffce9 branches: populate all template keywords in formatter Yuya Nishihara <yuya@tcha.org> parents: 29816 diff changeset	691
32949 13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	692	$ cat <<'EOF' > "$TESTTMP/map-myjson"
13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	693	> docheader = '\{\n'
13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	694	> docfooter = '\n}\n'
32950 5100ce217dfa formatter: add support for separator template Yuya Nishihara <yuya@tcha.org> parents: 32949 diff changeset	695	> separator = ',\n'
5100ce217dfa formatter: add support for separator template Yuya Nishihara <yuya@tcha.org> parents: 32949 diff changeset	696	> branches = ' {dict(branch, node\|short)\|json}'
32949 13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	697	> EOF
13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	698	$ hg branches -T "$TESTTMP/map-myjson"
13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	699	{
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	700	{"branch": "md", "node": "c914c99f1fbb"},
32949 13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	701	{"branch": "b", "node": "e23b5505d1ad"},
13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	702	{"branch": "a branch *", "node": "10ff5895aa57"}, (glob)
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	703	{"branch": "m", "node": "df343b0df04f"},
32949 13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	704	{"branch": "a", "node": "d8cbc61dbaa6"},
13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	705	{"branch": "default", "node": "19709c5a4e75"}
13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	706	}
13eebc189ff3 formatter: add support for docheader and docfooter templates Yuya Nishihara <yuya@tcha.org> parents: 31454 diff changeset	707
32952 61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	708	$ cat <<'EOF' >> .hg/hgrc
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	709	> [templates]
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	710	> myjson = ' {dict(branch, node\|short)\|json}'
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	711	> myjson:docheader = '\{\n'
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	712	> myjson:docfooter = '\n}\n'
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	713	> myjson:separator = ',\n'
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	714	> EOF
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	715	$ hg branches -T myjson
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	716	{
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	717	{"branch": "md", "node": "c914c99f1fbb"},
32952 61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	718	{"branch": "b", "node": "e23b5505d1ad"},
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	719	{"branch": "a branch *", "node": "10ff5895aa57"}, (glob)
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	720	{"branch": "m", "node": "df343b0df04f"},
32952 61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	721	{"branch": "a", "node": "d8cbc61dbaa6"},
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	722	{"branch": "default", "node": "19709c5a4e75"}
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	723	}
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	724
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	725	$ cat <<'EOF' >> .hg/hgrc
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	726	> [templates]
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	727	> :docheader = 'should not be selected as a docheader for literal templates\n'
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	728	> EOF
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	729	$ hg branches -T '{branch}\n'
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	730	md
32952 61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	731	b
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	732	a branch name much longer than the default justification used by branches
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	733	m
32952 61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	734	a
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	735	default
61b60b28c381 formatter: add support for parts map of [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32950 diff changeset	736
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	737	Tests of revision branch name caching
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	738
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	739	We rev branch cache is updated automatically. In these tests we use a trick to
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	740	trigger rebuilds. We remove the branch head cache and run 'hg head' to cause a
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	741	rebuild that also will populate the rev branch cache.
23787 678f53865c68 revset: use localrepo revbranchcache for branch name filtering Mads Kiilerich <madski@unity3d.com> parents: 23172 diff changeset	742
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	743	revision branch cache is created when building the branch head cache
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	744	$ rm -rf .hg/cache; hg head a -T '{rev}\n'
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	745	5
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	746	$ f --hexdump --size .hg/cache/rbc-*
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	747	.hg/cache/rbc-names-v1: size=92
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	748	0000: 64 65 66 61 75 6c 74 00 61 00 62 00 63 00 61 20 \|default.a.b.c.a \|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	749	0010: 62 72 61 6e 63 68 20 6e 61 6d 65 20 6d 75 63 68 \|branch name much\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	750	0020: 20 6c 6f 6e 67 65 72 20 74 68 61 6e 20 74 68 65 \| longer than the\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	751	0030: 20 64 65 66 61 75 6c 74 20 6a 75 73 74 69 66 69 \| default justifi\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	752	0040: 63 61 74 69 6f 6e 20 75 73 65 64 20 62 79 20 62 \|cation used by b\|
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	753	0050: 72 61 6e 63 68 65 73 00 6d 00 6d 64 \|ranches.m.md\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	754	.hg/cache/rbc-revs-v1: size=160
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	755	0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 \|.p.Z.....kD.....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	756	0010: 88 1f e2 b9 00 00 00 01 ac 22 03 33 00 00 00 02 \|.........".3....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	757	0020: ae e3 9c d1 00 00 00 02 d8 cb c6 1d 00 00 00 01 \|................\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	758	0030: 58 97 36 a2 00 00 00 03 10 ff 58 95 00 00 00 04 \|X.6.......X.....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	759	0040: ee bb 94 44 00 00 00 02 5f 40 61 bb 00 00 00 02 \|...D...._@a.....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	760	0050: bf be 84 1b 00 00 00 02 d3 f1 63 45 80 00 00 02 \|..........cE....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	761	0060: e3 d4 9c 05 80 00 00 02 e2 3b 55 05 00 00 00 02 \|.........;U.....\|
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	762	0070: f8 94 c2 56 80 00 00 03 f3 44 76 37 00 00 00 05 \|...V.....Dv7....\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	763	0080: a5 8c a5 d3 00 00 00 05 df 34 3b 0d 00 00 00 05 \|.........4;.....\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	764	0090: c9 14 c9 9f 00 00 00 06 cd 21 a8 0b 80 00 00 05 \|.........!......\|
24372 577f65cf1a57 revbranchcache: add test for when the cache is not writable Durham Goode <durham@fb.com> parents: 23862 diff changeset	765
577f65cf1a57 revbranchcache: add test for when the cache is not writable Durham Goode <durham@fb.com> parents: 23862 diff changeset	766	no errors when revbranchcache is not writable
577f65cf1a57 revbranchcache: add test for when the cache is not writable Durham Goode <durham@fb.com> parents: 23862 diff changeset	767
577f65cf1a57 revbranchcache: add test for when the cache is not writable Durham Goode <durham@fb.com> parents: 23862 diff changeset	768	$ echo >> .hg/cache/rbc-revs-v1
28145 cfa0037448f4 tests: change branches test to work cross platform timeless <timeless@mozdev.org> parents: 25295 diff changeset	769	$ mv .hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1_
cfa0037448f4 tests: change branches test to work cross platform timeless <timeless@mozdev.org> parents: 25295 diff changeset	770	$ mkdir .hg/cache/rbc-revs-v1
24372 577f65cf1a57 revbranchcache: add test for when the cache is not writable Durham Goode <durham@fb.com> parents: 23862 diff changeset	771	$ rm -f .hg/cache/branch* && hg head a -T '{rev}\n'
577f65cf1a57 revbranchcache: add test for when the cache is not writable Durham Goode <durham@fb.com> parents: 23862 diff changeset	772	5
28145 cfa0037448f4 tests: change branches test to work cross platform timeless <timeless@mozdev.org> parents: 25295 diff changeset	773	$ rmdir .hg/cache/rbc-revs-v1
cfa0037448f4 tests: change branches test to work cross platform timeless <timeless@mozdev.org> parents: 25295 diff changeset	774	$ mv .hg/cache/rbc-revs-v1_ .hg/cache/rbc-revs-v1
24372 577f65cf1a57 revbranchcache: add test for when the cache is not writable Durham Goode <durham@fb.com> parents: 23862 diff changeset	775
29744 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	776	no errors when wlock cannot be acquired
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	777
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	778	#if unix-permissions
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	779	$ mv .hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1_
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	780	$ rm -f .hg/cache/branch*
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	781	$ chmod 555 .hg
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	782	$ hg head a -T '{rev}\n'
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	783	5
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	784	$ chmod 755 .hg
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	785	$ mv .hg/cache/rbc-revs-v1_ .hg/cache/rbc-revs-v1
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	786	#endif
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	787
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	788	recovery from invalid cache revs file with trailing data
23787 678f53865c68 revset: use localrepo revbranchcache for branch name filtering Mads Kiilerich <madski@unity3d.com> parents: 23172 diff changeset	789	$ echo >> .hg/cache/rbc-revs-v1
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	790	$ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug
24378 9347c15d8136 revbranchcache: write cache even during read operations Durham Goode <durham@fb.com> parents: 24372 diff changeset	791	5
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	792	truncating cache/rbc-revs-v1 to 160
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	793	$ f --size .hg/cache/rbc-revs*
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	794	.hg/cache/rbc-revs-v1: size=160
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	795	recovery from invalid cache file with partial last record
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	796	$ mv .hg/cache/rbc-revs-v1 .
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	797	$ f -qDB 119 rbc-revs-v1 > .hg/cache/rbc-revs-v1
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	798	$ f --size .hg/cache/rbc-revs*
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	799	.hg/cache/rbc-revs-v1: size=119
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	800	$ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug
24378 9347c15d8136 revbranchcache: write cache even during read operations Durham Goode <durham@fb.com> parents: 24372 diff changeset	801	5
23862 7aa1405528a3 branchcache: add debug output whenever cache files use truncate Mads Kiilerich <madski@unity3d.com> parents: 23861 diff changeset	802	truncating cache/rbc-revs-v1 to 112
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	803	$ f --size .hg/cache/rbc-revs*
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	804	.hg/cache/rbc-revs-v1: size=160
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	805	recovery from invalid cache file with missing record - no truncation
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	806	$ mv .hg/cache/rbc-revs-v1 .
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	807	$ f -qDB 112 rbc-revs-v1 > .hg/cache/rbc-revs-v1
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	808	$ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	809	5
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	810	$ f --size .hg/cache/rbc-revs*
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	811	.hg/cache/rbc-revs-v1: size=160
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	812	recovery from invalid cache file with some bad records
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	813	$ mv .hg/cache/rbc-revs-v1 .
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	814	$ f -qDB 8 rbc-revs-v1 > .hg/cache/rbc-revs-v1
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	815	$ f --size .hg/cache/rbc-revs*
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	816	.hg/cache/rbc-revs-v1: size=8
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	817	$ f -qDB 112 rbc-revs-v1 >> .hg/cache/rbc-revs-v1
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	818	$ f --size .hg/cache/rbc-revs*
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	819	.hg/cache/rbc-revs-v1: size=120
24378 9347c15d8136 revbranchcache: write cache even during read operations Durham Goode <durham@fb.com> parents: 24372 diff changeset	820	$ hg log -r 'branch(.)' -T '{rev} ' --debug
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29614 diff changeset	821	history modification detected - truncating revision branch cache to revision 13
a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29614 diff changeset	822	history modification detected - truncating revision branch cache to revision 1
24378 9347c15d8136 revbranchcache: write cache even during read operations Durham Goode <durham@fb.com> parents: 24372 diff changeset	823	3 4 8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 8
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	824	$ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	825	5
24378 9347c15d8136 revbranchcache: write cache even during read operations Durham Goode <durham@fb.com> parents: 24372 diff changeset	826	truncating cache/rbc-revs-v1 to 104
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	827	$ f --size --hexdump --bytes=16 .hg/cache/rbc-revs*
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	828	.hg/cache/rbc-revs-v1: size=160
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	829	0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 \|.p.Z.....kD.....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	830	cache is updated when committing
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	831	$ hg branch i-will-regret-this
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	832	marked working directory as branch i-will-regret-this
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	833	$ hg ci -m regrets
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	834	$ f --size .hg/cache/rbc-*
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	835	.hg/cache/rbc-names-v1: size=111
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	836	.hg/cache/rbc-revs-v1: size=168
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	837	update after rollback - the cache will be correct but rbc-names will will still
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	838	contain the branch name even though it no longer is used
23787 678f53865c68 revset: use localrepo revbranchcache for branch name filtering Mads Kiilerich <madski@unity3d.com> parents: 23172 diff changeset	839	$ hg up -qr '.^'
678f53865c68 revset: use localrepo revbranchcache for branch name filtering Mads Kiilerich <madski@unity3d.com> parents: 23172 diff changeset	840	$ hg rollback -qf
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	841	$ f --size --hexdump .hg/cache/rbc-*
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	842	.hg/cache/rbc-names-v1: size=111
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	843	0000: 64 65 66 61 75 6c 74 00 61 00 62 00 63 00 61 20 \|default.a.b.c.a \|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	844	0010: 62 72 61 6e 63 68 20 6e 61 6d 65 20 6d 75 63 68 \|branch name much\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	845	0020: 20 6c 6f 6e 67 65 72 20 74 68 61 6e 20 74 68 65 \| longer than the\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	846	0030: 20 64 65 66 61 75 6c 74 20 6a 75 73 74 69 66 69 \| default justifi\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	847	0040: 63 61 74 69 6f 6e 20 75 73 65 64 20 62 79 20 62 \|cation used by b\|
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	848	0050: 72 61 6e 63 68 65 73 00 6d 00 6d 64 00 69 2d 77 \|ranches.m.md.i-w\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	849	0060: 69 6c 6c 2d 72 65 67 72 65 74 2d 74 68 69 73 \|ill-regret-this\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	850	.hg/cache/rbc-revs-v1: size=160
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	851	0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 \|.p.Z.....kD.....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	852	0010: 88 1f e2 b9 00 00 00 01 ac 22 03 33 00 00 00 02 \|.........".3....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	853	0020: ae e3 9c d1 00 00 00 02 d8 cb c6 1d 00 00 00 01 \|................\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	854	0030: 58 97 36 a2 00 00 00 03 10 ff 58 95 00 00 00 04 \|X.6.......X.....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	855	0040: ee bb 94 44 00 00 00 02 5f 40 61 bb 00 00 00 02 \|...D...._@a.....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	856	0050: bf be 84 1b 00 00 00 02 d3 f1 63 45 80 00 00 02 \|..........cE....\|
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	857	0060: e3 d4 9c 05 80 00 00 02 e2 3b 55 05 00 00 00 02 \|.........;U.....\|
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	858	0070: f8 94 c2 56 80 00 00 03 f3 44 76 37 00 00 00 05 \|...V.....Dv7....\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	859	0080: a5 8c a5 d3 00 00 00 05 df 34 3b 0d 00 00 00 05 \|.........4;.....\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	860	0090: c9 14 c9 9f 00 00 00 06 cd 21 a8 0b 80 00 00 05 \|.........!......\|
23861 01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	861	cache is updated/truncated when stripping - it is thus very hard to get in a
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	862	situation where the cache is out of sync and the hash check detects it
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	863	$ hg --config extensions.strip= strip -r tip --nob
01426cad66dc tests: rework revision branch cache tests Mads Kiilerich <madski@unity3d.com> parents: 23787 diff changeset	864	$ f --size .hg/cache/rbc-revs*
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	865	.hg/cache/rbc-revs-v1: size=152
23787 678f53865c68 revset: use localrepo revbranchcache for branch name filtering Mads Kiilerich <madski@unity3d.com> parents: 23172 diff changeset	866
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	867	cache is rebuilt when corruption is detected
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	868	$ echo > .hg/cache/rbc-names-v1
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	869	$ hg log -r '5:&branch(.)' -T '{rev} ' --debug
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29614 diff changeset	870	referenced branch names not found - rebuilding revision branch cache from scratch
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	871	8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 40
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	872	$ f --size --hexdump .hg/cache/rbc-*
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	873	.hg/cache/rbc-names-v1: size=84
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	874	0000: 62 00 61 00 63 00 61 20 62 72 61 6e 63 68 20 6e \|b.a.c.a branch n\|
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	875	0010: 61 6d 65 20 6d 75 63 68 20 6c 6f 6e 67 65 72 20 \|ame much longer \|
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	876	0020: 74 68 61 6e 20 74 68 65 20 64 65 66 61 75 6c 74 \|than the default\|
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	877	0030: 20 6a 75 73 74 69 66 69 63 61 74 69 6f 6e 20 75 \| justification u\|
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	878	0040: 73 65 64 20 62 79 20 62 72 61 6e 63 68 65 73 00 \|sed by branches.\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	879	0050: 6d 00 6d 64 \|m.md\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	880	.hg/cache/rbc-revs-v1: size=152
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	881	0000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \|................\|
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	882	0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \|................\|
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	883	0020: 00 00 00 00 00 00 00 00 d8 cb c6 1d 00 00 00 01 \|................\|
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	884	0030: 58 97 36 a2 00 00 00 02 10 ff 58 95 00 00 00 03 \|X.6.......X.....\|
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	885	0040: ee bb 94 44 00 00 00 00 5f 40 61 bb 00 00 00 00 \|...D...._@a.....\|
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	886	0050: bf be 84 1b 00 00 00 00 d3 f1 63 45 80 00 00 00 \|..........cE....\|
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	887	0060: e3 d4 9c 05 80 00 00 00 e2 3b 55 05 00 00 00 00 \|.........;U.....\|
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	888	0070: f8 94 c2 56 80 00 00 02 f3 44 76 37 00 00 00 04 \|...V.....Dv7....\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	889	0080: a5 8c a5 d3 00 00 00 04 df 34 3b 0d 00 00 00 04 \|.........4;.....\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	890	0090: c9 14 c9 9f 00 00 00 05 \|........\|
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28145 diff changeset	891
29603 b181a650a886 rbc: test case for cache file not growing correctly, causing bad new entries Mads Kiilerich <madski@unity3d.com> parents: 28558 diff changeset	892	Test that cache files are created and grows correctly:
b181a650a886 rbc: test case for cache file not growing correctly, causing bad new entries Mads Kiilerich <madski@unity3d.com> parents: 28558 diff changeset	893
b181a650a886 rbc: test case for cache file not growing correctly, causing bad new entries Mads Kiilerich <madski@unity3d.com> parents: 28558 diff changeset	894	$ rm .hg/cache/rbc*
b181a650a886 rbc: test case for cache file not growing correctly, causing bad new entries Mads Kiilerich <madski@unity3d.com> parents: 28558 diff changeset	895	$ hg log -r "5 & branch(5)" -T "{rev}\n"
b181a650a886 rbc: test case for cache file not growing correctly, causing bad new entries Mads Kiilerich <madski@unity3d.com> parents: 28558 diff changeset	896	5
b181a650a886 rbc: test case for cache file not growing correctly, causing bad new entries Mads Kiilerich <madski@unity3d.com> parents: 28558 diff changeset	897	$ f --size --hexdump .hg/cache/rbc-*
b181a650a886 rbc: test case for cache file not growing correctly, causing bad new entries Mads Kiilerich <madski@unity3d.com> parents: 28558 diff changeset	898	.hg/cache/rbc-names-v1: size=1
b181a650a886 rbc: test case for cache file not growing correctly, causing bad new entries Mads Kiilerich <madski@unity3d.com> parents: 28558 diff changeset	899	0000: 61 \|a\|
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	900	.hg/cache/rbc-revs-v1: size=152
29604 db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29603 diff changeset	901	0000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \|................\|
db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29603 diff changeset	902	0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \|................\|
db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29603 diff changeset	903	0020: 00 00 00 00 00 00 00 00 d8 cb c6 1d 00 00 00 00 \|................\|
db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29603 diff changeset	904	0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \|................\|
db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29603 diff changeset	905	0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \|................\|
db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29603 diff changeset	906	0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \|................\|
db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29603 diff changeset	907	0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \|................\|
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	908	0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \|................\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	909	0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \|................\|
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 32952 diff changeset	910	0090: 00 00 00 00 00 00 00 00 \|........\|
29603 b181a650a886 rbc: test case for cache file not growing correctly, causing bad new entries Mads Kiilerich <madski@unity3d.com> parents: 28558 diff changeset	911
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16612 diff changeset	912	$ cd ..
29614 5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	913
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	914	Test for multiple incorrect branch cache entries:
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	915
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	916	$ hg init b
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	917	$ cd b
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	918	$ touch f
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	919	$ hg ci -Aqmf
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	920	$ echo >> f
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	921	$ hg ci -Amf
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	922	$ hg branch -q branch
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	923	$ hg ci -Amf
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	924
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	925	$ f --size --hexdump .hg/cache/rbc-*
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	926	.hg/cache/rbc-names-v1: size=14
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	927	0000: 64 65 66 61 75 6c 74 00 62 72 61 6e 63 68 \|default.branch\|
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	928	.hg/cache/rbc-revs-v1: size=24
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	929	0000: 66 e5 f5 aa 00 00 00 00 fa 4c 04 e5 00 00 00 00 \|f........L......\|
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	930	0010: 56 46 78 69 00 00 00 01 \|VFxi....\|
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	931	$ : > .hg/cache/rbc-revs-v1
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	932
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29614 diff changeset	933	No superfluous rebuilding of cache:
29614 5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	934	$ hg log -r "branch(null)&branch(branch)" --debug
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	935	$ f --size --hexdump .hg/cache/rbc-*
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	936	.hg/cache/rbc-names-v1: size=14
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	937	0000: 64 65 66 61 75 6c 74 00 62 72 61 6e 63 68 \|default.branch\|
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	938	.hg/cache/rbc-revs-v1: size=24
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29614 diff changeset	939	0000: 66 e5 f5 aa 00 00 00 00 fa 4c 04 e5 00 00 00 00 \|f........L......\|
29614 5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	940	0010: 56 46 78 69 00 00 00 01 \|VFxi....\|
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	941
5c79bae8166f rbc: test case for incorrect and too aggressive invalidation of invalid caches Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	942	$ cd ..
42201 258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	943
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	944	Test to make sure that `--close-branch` only works on a branch head:
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	945	--------------------------------------------------------------------
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	946	$ hg init closebranch
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	947	$ cd closebranch
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	948	$ for ch in a b c; do
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	949	> echo $ch > $ch
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	950	> hg add $ch
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	951	> hg ci -m "added "$ch
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	952	> done;
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	953
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	954	$ hg up -r "desc('added b')"
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	955	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	956
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	957	trying to close branch from a cset which is not a branch head
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	958	it should abort:
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	959	$ hg ci -m "closing branch" --close-branch
42202 8d14d91584f1 branch: abort if closing branch from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 42201 diff changeset	960	abort: can only close branch heads
8d14d91584f1 branch: abort if closing branch from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 42201 diff changeset	961	[255]
42201 258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	962
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	963	$ hg up 0
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	964	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	965	$ hg log -GT "{rev}: {node\|short} {desc\|firstline}\n\t{branch}\n\n"
42202 8d14d91584f1 branch: abort if closing branch from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 42201 diff changeset	966	o 2: 155349b645be added c
42201 258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	967	\| default
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	968	\|
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	969	o 1: 5f6d8a4bf34a added b
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	970	\| default
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	971	\|
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	972	@ 0: 9092f1db7931 added a
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	973	default
258821f2d465 branch: add tests which shows branch can be closed from a non-branchhead cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 41064 diff changeset	974

author	Sushil khanchi <sushilkhanchi97@gmail.com>
	Tue, 16 Apr 2019 02:06:20 +0530
changeset 42202	8d14d91584f1
parent 42201	258821f2d465
child 42493	9f7cb777b654
permissions	-rw-r--r--