evolve: tests/test-topic.t@39c3b2b5deb0 (annotated)

2045 db617700d318 tests: move "test setup" script into a 'testlib' directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2019 diff changeset	1	$ . "$TESTDIR/testlib/topic_setup.sh"
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	2
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	3	$ hg init pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	4	$ cd pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	5	$ cat <<EOF >> .hg/hgrc
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	6	> [phases]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	7	> publish=false
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	8	> EOF
1931 1cc2b87c91df test: disable the new style rendering for "missing parent" Pierre-Yves David <pierre-yves.david@fb.com> parents: 1895 diff changeset	9	$ cat <<EOF >> $HGRCPATH
1cc2b87c91df test: disable the new style rendering for "missing parent" Pierre-Yves David <pierre-yves.david@fb.com> parents: 1895 diff changeset	10	> [experimental]
1cc2b87c91df test: disable the new style rendering for "missing parent" Pierre-Yves David <pierre-yves.david@fb.com> parents: 1895 diff changeset	11	> # disable the new graph style until we drop 3.7 support
1cc2b87c91df test: disable the new style rendering for "missing parent" Pierre-Yves David <pierre-yves.david@fb.com> parents: 1895 diff changeset	12	> graphstyle.missing = \|
1cc2b87c91df test: disable the new style rendering for "missing parent" Pierre-Yves David <pierre-yves.david@fb.com> parents: 1895 diff changeset	13	> EOF
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	14
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	15	$ hg help topics
1847 9fa5b8f4e98e topics: add command summary Matt Mackall <mpm@selenic.com> parents: 1844 diff changeset	16	hg topics [TOPIC]
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	17
2717 ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	18	View current topic, set current topic, change topic for a set of revisions, or
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	19	see all topics.
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	20
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	21	Clear topic on existing topiced revisions:
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	22	'hg topic --rev <related revset> --clear'
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	23
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	24	Change topic on some revisions:
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	25	'hg topic <newtopicname> --rev <related revset>'
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	26
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	27	Clear current topic:
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	28	'hg topic --clear'
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	29
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	30	Set current topic:
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	31	'hg topic <topicname>'
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	32
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	33	List of topics:
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	34	'hg topics'
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	35
2731 d39942773163 topics: add a new flag --age which will show last touched time for topics Pulkit Goyal <7895pulkit@gmail.com> parents: 2718 diff changeset	36	List of topics with their last touched time sorted according to it:
d39942773163 topics: add a new flag --age which will show last touched time for topics Pulkit Goyal <7895pulkit@gmail.com> parents: 2718 diff changeset	37	'hg topic --age'
d39942773163 topics: add a new flag --age which will show last touched time for topics Pulkit Goyal <7895pulkit@gmail.com> parents: 2718 diff changeset	38
2717 ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	39	The active topic (if any) will be prepended with a "*".
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	40
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1953 diff changeset	41	The --verbose version of this command display various information on the
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1953 diff changeset	42	state of each topic.
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1953 diff changeset	43
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	44	options:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	45
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	46	--clear clear active topic if any
a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	47	-r --rev REV revset of existing revisions
a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	48	-l --list show the stack of changeset in the topic
2731 d39942773163 topics: add a new flag --age which will show last touched time for topics Pulkit Goyal <7895pulkit@gmail.com> parents: 2718 diff changeset	49	--age show when you last touched the topics
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	50
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	51	(some details hidden, use --verbose to show complete help)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	52	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	53
1851 67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	54	Test topics interaction with evolution:
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	55
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	56	$ hg topics --config experimental.evolution=
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	57	$ hg topics --config experimental.evolution= --rev . bob
a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	58	abort: must have obsolete enabled to change topics
1851 67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	59	[255]
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	60
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	61	Create some changes:
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	62
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	63	$ for x in alpha beta gamma delta ; do
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	64	> echo file $x >> $x
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	65	> hg addremove
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	66	> hg ci -m "Add file $x"
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	67	> done
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	68	adding alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	69	adding beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	70	adding gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	71	adding delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	72
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	73	Still no topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	74	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	75
1852 3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	76	Test commit flag and help text
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	77
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	78	$ echo stuff >> alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	79	$ HGEDITOR=cat hg ci -t topicflag
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	80
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	81
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	82	HG: Enter commit message. Lines beginning with 'HG:' are removed.
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	83	HG: Leave message empty to abort commit.
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	84	HG: --
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	85	HG: user: test
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	86	HG: topic 'topicflag'
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	87	HG: branch 'default'
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	88	HG: changed alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	89	abort: empty commit message
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	90	[255]
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	91	$ hg revert alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	92	$ hg topic
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	93	* topicflag
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	94
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	95	Make a topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	96	$ hg topic narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	97	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	98	* narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	99	$ echo topic work >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	100	$ hg ci -m 'start on narf'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	101	$ hg co .^
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	102	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	103	$ hg topic fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	104	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	105	* fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	106	narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	107	$ echo >> fran work >> beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	108	$ hg ci -m 'start on fran'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	109	$ hg co narf
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	110	switching to topic narf
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	111	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	112	$ hg topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	113	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	114	* narf
1869 995617c7f2fc template: test that topic is accessible through template Pierre-Yves David <pierre-yves.david@fb.com> parents: 1868 diff changeset	115	$ hg log -r . -T '{topics}\n'
995617c7f2fc template: test that topic is accessible through template Pierre-Yves David <pierre-yves.david@fb.com> parents: 1868 diff changeset	116	narf
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	117	$ echo 'narf!!!' >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	118	$ hg ci -m 'narf!'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	119	$ hg log -G
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	120	@ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	121	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	122	\| topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	123	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	124	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	125	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	126	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	127	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	128	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	129	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	130	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	131	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	132	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	133	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	134	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	135	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	136	\|/ topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	137	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	138	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	139	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	140	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	141	o changeset: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	142	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	143	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	144	\| summary: Add file delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	145	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	146	o changeset: 2:15d1eb11d2fa
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	147	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	148	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	149	\| summary: Add file gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	150	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	151	o changeset: 1:c692ea2c9224
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	152	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	153	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	154	\| summary: Add file beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	155	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	156	o changeset: 0:c2b7d2f7d14b
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	157	user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	158	date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	159	summary: Add file alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	160
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	161
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	162	Exchanging of topics:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	163	$ cd ..
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	164	$ hg init brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	165	$ hg -R pinky push -r 4 brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	166	pushing to brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	167	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	168	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	169	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	170	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	171	added 5 changesets with 5 changes to 4 files
1866 13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	172
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	173	Export
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	174
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	175	$ hg -R pinky export
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	176	# HG changeset patch
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	177	# User test
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	178	# Date 0 0
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	179	# Thu Jan 01 00:00:00 1970 +0000
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	180	# Node ID 7c34953036d6a36eae468c550d0592b89ee8bffc
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	181	# Parent fb147b0b417c25ca15547cd945acf51cf8dcaf02
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	182	# EXP-Topic narf
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	183	narf!
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	184
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	185	diff -r fb147b0b417c -r 7c34953036d6 alpha
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	186	--- a/alpha Thu Jan 01 00:00:00 1970 +0000
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	187	+++ b/alpha Thu Jan 01 00:00:00 1970 +0000
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	188	@@ -1,2 +1,3 @@
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	189	file alpha
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	190	topic work
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	191	+narf!!!
1867 c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	192
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	193	Import
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	194
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	195	$ hg -R pinky export > narf.diff
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	196	$ hg -R pinky --config extensions.strip= strip .
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	197	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	198	saved backup bundle to $TESTTMP/pinky/.hg/strip-backup/7c34953036d6-1ff3bae2-backup.hg (glob)
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	199	$ hg -R pinky import narf.diff
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	200	applying narf.diff
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	201	$ hg -R pinky log -r .
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	202	changeset: 6:7c34953036d6
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	203	tag: tip
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	204	topic: narf
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	205	parent: 4:fb147b0b417c
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	206	user: test
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	207	date: Thu Jan 01 00:00:00 1970 +0000
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	208	summary: narf!
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	209
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	210	Now that we've pushed to brain, the work done on narf is no longer a
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	211	draft, so we won't see that topic name anymore:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	212
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	213	$ hg log -R pinky -G
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	214	@ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	215	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	216	\| topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	217	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	218	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	219	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	220	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	221	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	222	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	223	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	224	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	225	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	226	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	227	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	228	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	229	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	230	\|/ user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	231	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	232	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	233	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	234	o changeset: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	235	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	236	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	237	\| summary: Add file delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	238	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	239	o changeset: 2:15d1eb11d2fa
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	240	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	241	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	242	\| summary: Add file gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	243	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	244	o changeset: 1:c692ea2c9224
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	245	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	246	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	247	\| summary: Add file beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	248	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	249	o changeset: 0:c2b7d2f7d14b
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	250	user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	251	date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	252	summary: Add file alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	253
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	254	$ cd brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	255	$ hg co tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	256	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	257
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	258	Because the change is public, we won't inherit the topic from narf.
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	259
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	260	$ hg topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	261	$ echo what >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	262	$ hg topic query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	263	$ hg ci -m 'what is narf, pinky?'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	264	$ hg log -Gl2
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	265	@ changeset: 5:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	266	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	267	\| topic: query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	268	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	269	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	270	\| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	271	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	272	o changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	273	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	274	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	275	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	276	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	277	$ hg push -f ../pinky -r query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	278	pushing to ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	279	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	280	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	281	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	282	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	283	added 1 changesets with 1 changes to 1 files (+1 heads)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	284	$ hg -R ../pinky log -Gl 4
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	285	o changeset: 7:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	286	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	287	\| topic: query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	288	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	289	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	290	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	291	\| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	292	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	293	\| @ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	294	\|/ topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	295	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	296	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	297	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	298	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	299	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	300	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	301	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	302	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	303	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	304	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	305	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	306	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	307	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	308	\|/ user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	309	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	310	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	311	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	312	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	313	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	314	$ cd ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	315	$ hg co query
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	316	switching to topic query
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	317	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	318	$ echo answer >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	319	$ hg ci -m 'Narf is like `zort` or `poit`!'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	320	$ hg merge narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	321	merging alpha
1868 5cdd5e0a421c test: adapt to newer mercurial Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	322	warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark')
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	323	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	324	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	325	[1]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	326	$ hg revert -r narf alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	327	$ hg resolve -m alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	328	(no more unresolved files)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	329	$ hg topic narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	330	$ hg ci -m 'Finish narf'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	331	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	332	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	333	* narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	334	query
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	335	$ hg debugnamecomplete # branch:topic here is a buggy side effect
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	336	default
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	337	default:fran
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	338	default:narf
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	339	default:query
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	340	fran
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	341	narf
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	342	query
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	343	tip
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	344	$ hg phase --public narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	345
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	346	POSSIBLE BUG: narf topic stays alive even though we just made all
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	347	narf commits public:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	348
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	349	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	350	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	351	* narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	352	$ hg log -Gl 6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	353	@ changeset: 9:ae074045b7a7
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	354	\|\ tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	355	\| \| parent: 8:54c943c1c167
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	356	\| \| parent: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	357	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	358	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	359	\| \| summary: Finish narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	360	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	361	\| o changeset: 8:54c943c1c167
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	362	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	363	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	364	\| \| summary: Narf is like `zort` or `poit`!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	365	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	366	\| o changeset: 7:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	367	\| \| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	368	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	369	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	370	\| \| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	371	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	372	o \| changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	373	\|/ parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	374	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	375	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	376	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	377	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	378	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	379	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	380	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	381	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	382	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	383	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	384	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	385	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	386	\|/ user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	387	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	388	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	389	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	390	$ cd ../brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	391	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	392	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	393	$ hg pull ../pinky -r narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	394	pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	395	abort: unknown revision 'narf'!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	396	[255]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	397	$ hg pull ../pinky -r default
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	398	pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	399	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	400	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	401	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	402	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	403	added 3 changesets with 3 changes to 1 files
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	404	(run 'hg update' to get a working copy)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	405	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	406	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	407
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	408	We can pull in the draft-phase change and we get the new topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	409
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	410	$ hg pull ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	411	pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	412	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	413	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	414	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	415	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	416	added 1 changesets with 1 changes to 1 files (+1 heads)
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	417	(run 'hg heads' to see heads)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	418	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	419	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	420	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	421	$ hg log -Gr 'draft()'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	422	o changeset: 9:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	423	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	424	\| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	425	\| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	426	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	427	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	428	\| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	429	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	430
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	431	query is not an open topic, so when we clear the current topic it'll
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	432	disappear:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	433
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	434	$ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	435	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	436	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	437
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	438	--clear when we don't have an active topic isn't an error:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	439
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	440	$ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	441
1843 0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	442	Topic revset
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	443	$ hg log -r 'topic()' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	444	o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	445	\| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	446	\| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	447	\| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	448	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	449	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	450	\| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	451	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	452	$ hg log -r 'not topic()' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	453	o changeset: 8:ae074045b7a7
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	454	\|\ parent: 7:54c943c1c167
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	455	\| \| parent: 6:7c34953036d6
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	456	\| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	457	\| \| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	458	\| \| summary: Finish narf
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	459	\| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	460	\| o changeset: 7:54c943c1c167
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	461	\| \| parent: 5:c01515cfc331
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	462	\| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	463	\| \| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	464	\| \| summary: Narf is like `zort` or `poit`!
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	465	\| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	466	o \| changeset: 6:7c34953036d6
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	467	\| \| parent: 4:fb147b0b417c
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	468	\| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	469	\| \| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	470	\| \| summary: narf!
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	471	\| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	472	\| @ changeset: 5:c01515cfc331
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	473	\|/ user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	474	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	475	\| summary: what is narf, pinky?
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	476	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	477	o changeset: 4:fb147b0b417c
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	478	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	479	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	480	\| summary: start on narf
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	481	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	482	o changeset: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	483	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	484	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	485	\| summary: Add file delta
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	486	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	487	o changeset: 2:15d1eb11d2fa
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	488	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	489	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	490	\| summary: Add file gamma
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	491	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	492	o changeset: 1:c692ea2c9224
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	493	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	494	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	495	\| summary: Add file beta
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	496	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	497	o changeset: 0:c2b7d2f7d14b
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	498	user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	499	date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	500	summary: Add file alpha
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	501
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	502	No matches because narf is already closed:
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	503	$ hg log -r 'topic(narf)' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	504	This regexp should match the topic `fran`:
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	505	$ hg log -r 'topic("re:.ra.")' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	506	o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	507	\| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	508	\| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	509	\| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	510	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	511	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	512	\| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	513	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	514	Exact match on fran:
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	515	$ hg log -r 'topic(fran)' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	516	o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	517	\| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	518	\| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	519	\| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	520	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	521	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	522	\| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	523	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	524
1864 70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	525	Match current topic:
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	526	$ hg topic
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	527	fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	528	$ hg log -r 'topic(.)'
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	529	(no output is expected)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	530	$ hg co fran
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	531	switching to topic fran
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	532	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1864 70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	533	$ hg log -r 'topic(.)'
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	534	changeset: 9:0469d521db49
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	535	tag: tip
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	536	topic: fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	537	parent: 3:a53952faf762
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	538	user: test
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	539	date: Thu Jan 01 00:00:00 1970 +0000
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	540	summary: start on fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	541
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	542
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	543	Deactivate the topic.
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	544	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	545	* fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	546	$ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	547	$ echo fran? >> beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	548	$ hg ci -m 'fran?'
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	549	created new head
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	550	$ hg log -Gr 'draft()'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	551	@ changeset: 10:4073470c35e1
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	552	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	553	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	554	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	555	\| summary: fran?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	556	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	557	o changeset: 9:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	558	\| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	559	\| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	560	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	561	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	562	\| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	563	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	564	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	565	fran
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	566	Changing topic fails if we don't give a topic
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	567	$ hg topic --rev 9
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	568	abort: changing topic requires a topic name or --clear
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	569	[255]
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	570
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	571	Can't change topic of a public change
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	572	$ hg topic --rev 1:: --clear
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	573	abort: can't change topic of a public change
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	574	[255]
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	575
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	576	Can clear topics
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	577	$ hg topic --rev 9 --clear
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	578	changed topic on 1 changes
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	579	$ hg log -Gr 'draft() and not obsolete()'
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	580	o changeset: 11:0beca5ab56c3
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	581	\| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	582	\| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	583	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	584	\| date: Thu Jan 01 00:00:00 1970 +0000
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	585	\| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	586	\|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	587	\| @ changeset: 10:4073470c35e1
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	588	\| \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	589	\| \| date: Thu Jan 01 00:00:00 1970 +0000
2019 996a562b6c9f test: adapt to new core output Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	590	\| \| trouble: unstable
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	591	\| \| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	592	\| \|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	593
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	594	Normally you'd do this with evolve, but we'll use rebase to avoid
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	595	bonus deps in the testsuite.
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	596
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	597	$ hg rebase -d tip -s .
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	598	rebasing 10:4073470c35e1 "fran?"
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	599
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	600	Can add a topic to an existing change
2663 c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	601	$ hg topic
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	602	$ hg sum
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	603	parent: 12:18b70b8de1f0 tip
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	604	fran?
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	605	branch: default
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	606	commit: (clean)
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	607	update: 5 new changesets, 2 branch heads (merge)
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	608	phases: 2 draft
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	609	$ hg topic --rev 11 wat
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	610	changed topic on 1 changes
2663 c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	611	$ hg log -r .
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	612	changeset: 12:18b70b8de1f0
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	613	user: test
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	614	date: Thu Jan 01 00:00:00 1970 +0000
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	615	trouble: unstable
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	616	summary: fran?
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	617
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	618	$ hg sum
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	619	parent: 12:18b70b8de1f0 (unstable)
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	620	fran?
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	621	branch: default
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	622	commit: (clean)
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	623	update: 5 new changesets, 2 branch heads (merge)
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	624	phases: 3 draft
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	625	unstable: 1 changesets
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	626	$ hg topic
2664 ed6fb5f20b24 topics: return early so that other if conditions don't get execute (issue5600) Pulkit Goyal <7895pulkit@gmail.com> parents: 2663 diff changeset	627	wat
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	628	$ hg log -Gr 'draft() and not obsolete()'
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	629	o changeset: 13:686a642006db
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	630	\| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	631	\| topic: wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	632	\| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	633	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	634	\| date: Thu Jan 01 00:00:00 1970 +0000
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	635	\| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	636	\|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	637	\| @ changeset: 12:18b70b8de1f0
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	638	\| \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	639	\| \| date: Thu Jan 01 00:00:00 1970 +0000
2019 996a562b6c9f test: adapt to new core output Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	640	\| \| trouble: unstable
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	641	\| \| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	642	\| \|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	643
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	644	Normally you'd do this with evolve, but we'll use rebase to avoid
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	645	bonus deps in the testsuite.
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	646
2661 914757c70217 tests: expand output to check topic activation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2649 diff changeset	647	$ hg topic
2664 ed6fb5f20b24 topics: return early so that other if conditions don't get execute (issue5600) Pulkit Goyal <7895pulkit@gmail.com> parents: 2663 diff changeset	648	wat
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	649	$ hg rebase -d tip -s .
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	650	rebasing 12:18b70b8de1f0 "fran?"
2664 ed6fb5f20b24 topics: return early so that other if conditions don't get execute (issue5600) Pulkit Goyal <7895pulkit@gmail.com> parents: 2663 diff changeset	651	switching to topic wat
2661 914757c70217 tests: expand output to check topic activation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2649 diff changeset	652	$ hg topic
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2665 diff changeset	653	wat
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	654
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	655	$ hg log -Gr 'draft()'
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2665 diff changeset	656	@ changeset: 14:45358f7a5892
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	657	\| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	658	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	659	\| date: Thu Jan 01 00:00:00 1970 +0000
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	660	\| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	661	\|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	662	o changeset: 13:686a642006db
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	663	\| topic: wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	664	\| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	665	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	666	\| date: Thu Jan 01 00:00:00 1970 +0000
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	667	\| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	668	\|
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	669
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	670	Amend a topic
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	671
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	672	$ hg topic watwat
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	673	$ hg ci --amend
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	674	$ hg log -Gr 'draft()'
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2665 diff changeset	675	@ changeset: 16:6c40a4c21bbe
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	676	\| tag: tip
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	677	\| topic: watwat
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	678	\| parent: 13:686a642006db
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	679	\| user: test
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	680	\| date: Thu Jan 01 00:00:00 1970 +0000
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	681	\| summary: fran?
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	682	\|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	683	o changeset: 13:686a642006db
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	684	\| topic: wat
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	685	\| parent: 3:a53952faf762
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	686	\| user: test
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	687	\| date: Thu Jan 01 00:00:00 1970 +0000
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	688	\| summary: start on fran
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	689	\|
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	690
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	691	Clear and amend:
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	692
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	693	$ hg topic --clear
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	694	$ hg ci --amend
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	695	$ hg log -r .
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2665 diff changeset	696	changeset: 18:0f9cd5070654
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	697	tag: tip
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	698	parent: 13:686a642006db
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	699	user: test
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	700	date: Thu Jan 01 00:00:00 1970 +0000
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	701	summary: fran?
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	702
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	703	Reading the same topic with topic --rev should work:
a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	704	$ hg topic --rev . watwat
2648 d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2646 diff changeset	705	switching to topic watwat
1874 ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1869 diff changeset	706	changed topic on 1 changes
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	707
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	708	Testing issue5441
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	709	$ hg co 19
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	710	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	711	$ hg log -Gr 'draft()'
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2665 diff changeset	712	@ changeset: 19:980a0f608481
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	713	\| tag: tip
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	714	\| topic: watwat
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	715	\| parent: 13:686a642006db
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	716	\| user: test
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	717	\| date: Thu Jan 01 00:00:00 1970 +0000
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	718	\| summary: fran?
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	719	\|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	720	o changeset: 13:686a642006db
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	721	\| topic: wat
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	722	\| parent: 3:a53952faf762
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	723	\| user: test
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	724	\| date: Thu Jan 01 00:00:00 1970 +0000
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	725	\| summary: start on fran
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	726	\|
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	727
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	728	$ hg topics --rev '13::19' changewat
2648 d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2646 diff changeset	729	switching to topic changewat
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	730	changed topic on 2 changes
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	731	$ hg log -Gr 'draft()'
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2665 diff changeset	732	@ changeset: 21:56c83be6105f
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	733	\| tag: tip
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	734	\| topic: changewat
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	735	\| user: test
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	736	\| date: Thu Jan 01 00:00:00 1970 +0000
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	737	\| summary: fran?
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	738	\|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	739	o changeset: 20:ceba5be9d56f
2624 fd602980f7ee topics: make sure we commit on new parents while changing topics (issue5441) Pulkit Goyal <7895pulkit@gmail.com> parents: 2623 diff changeset	740	\| topic: changewat
fd602980f7ee topics: make sure we commit on new parents while changing topics (issue5441) Pulkit Goyal <7895pulkit@gmail.com> parents: 2623 diff changeset	741	\| parent: 3:a53952faf762
fd602980f7ee topics: make sure we commit on new parents while changing topics (issue5441) Pulkit Goyal <7895pulkit@gmail.com> parents: 2623 diff changeset	742	\| user: test
fd602980f7ee topics: make sure we commit on new parents while changing topics (issue5441) Pulkit Goyal <7895pulkit@gmail.com> parents: 2623 diff changeset	743	\| date: Thu Jan 01 00:00:00 1970 +0000
fd602980f7ee topics: make sure we commit on new parents while changing topics (issue5441) Pulkit Goyal <7895pulkit@gmail.com> parents: 2623 diff changeset	744	\| summary: start on fran
fd602980f7ee topics: make sure we commit on new parents while changing topics (issue5441) Pulkit Goyal <7895pulkit@gmail.com> parents: 2623 diff changeset	745	\|
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	746
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	747	Case with branching:
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	748
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	749	$ hg up changewat
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	750	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	751	$ hg up t1
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	752	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	753	$ echo gamma >> gamma
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	754	$ hg ci -m gamma
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	755	$ hg log -Gr 'draft()'
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	756	@ changeset: 22:0d3d805542b4
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	757	\| tag: tip
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	758	\| topic: changewat
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	759	\| parent: 20:ceba5be9d56f
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	760	\| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	761	\| date: Thu Jan 01 00:00:00 1970 +0000
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	762	\| summary: gamma
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	763	\|
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2665 diff changeset	764	\| o changeset: 21:56c83be6105f
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	765	\|/ topic: changewat
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	766	\| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	767	\| date: Thu Jan 01 00:00:00 1970 +0000
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	768	\| summary: fran?
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	769	\|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	770	o changeset: 20:ceba5be9d56f
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	771	\| topic: changewat
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	772	\| parent: 3:a53952faf762
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	773	\| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	774	\| date: Thu Jan 01 00:00:00 1970 +0000
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	775	\| summary: start on fran
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	776	\|
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	777	$ hg topics --rev 't1::' changewut
2648 d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2646 diff changeset	778	switching to topic changewut
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	779	changed topic on 3 changes
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	780	$ hg log -Gr 'draft()'
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	781	@ changeset: 25:729ed5717393
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	782	\| tag: tip
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	783	\| topic: changewut
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	784	\| parent: 23:62e49f09f883
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	785	\| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	786	\| date: Thu Jan 01 00:00:00 1970 +0000
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	787	\| summary: gamma
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	788	\|
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2665 diff changeset	789	\| o changeset: 24:369c6e2e5474
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	790	\|/ topic: changewut
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	791	\| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	792	\| date: Thu Jan 01 00:00:00 1970 +0000
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	793	\| summary: fran?
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	794	\|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	795	o changeset: 23:62e49f09f883
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	796	\| topic: changewut
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	797	\| parent: 3:a53952faf762
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	798	\| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	799	\| date: Thu Jan 01 00:00:00 1970 +0000
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	800	\| summary: start on fran
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	801	\|
2712 f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	802
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	803	Testing for updating to t0
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	804	==========================
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	805
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	806	$ hg stack
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	807	### topic: changewut (2 heads)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	808	### branch: default, 5 behind
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	809	t3: fran?
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	810	t1^ start on fran (base)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	811	t2@ gamma (current)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	812	t1: start on fran
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	813	t0^ Add file delta (base)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	814	$ hg up t0
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	815	preserving the current topic 'changewut'
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	816	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	817	$ hg topic
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	818	* changewut
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	819	$ hg stack
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	820	### topic: changewut (2 heads)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	821	### branch: default, 5 behind
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	822	t3: fran?
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	823	t1^ start on fran (base)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	824	t2: gamma
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	825	t1: start on fran
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	826	t0^ Add file delta (base)
2718 b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	827
2731 d39942773163 topics: add a new flag --age which will show last touched time for topics Pulkit Goyal <7895pulkit@gmail.com> parents: 2718 diff changeset	828	$ hg topics --age
d39942773163 topics: add a new flag --age which will show last touched time for topics Pulkit Goyal <7895pulkit@gmail.com> parents: 2718 diff changeset	829	* changewut (1970-01-01)
d39942773163 topics: add a new flag --age which will show last touched time for topics Pulkit Goyal <7895pulkit@gmail.com> parents: 2718 diff changeset	830
2718 b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	831	$ cd ..
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	832
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	833	Testing the new config knob to forbid untopiced commit
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	834	======================================================
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	835
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	836	$ hg init ponky
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	837	$ cd ponky
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	838	$ cat <<EOF >> .hg/hgrc
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	839	> [phases]
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	840	> publish=false
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	841	> EOF
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	842	$ cat <<EOF >> $HGRCPATH
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	843	> [experimental]
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	844	> enforce-topic = yes
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	845	> EOF
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	846	$ touch a b c d
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	847	$ hg add a
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	848	$ hg ci -m "Added a"
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	849	abort: no active topic
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	850	(set a current topic or use '--config experimental.enforce-topic=no' to commit without a topic)
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	851	[255]
2733 adfbb984ebbb topics: check for topic on commit before a user enters message Pulkit Goyal <7895pulkit@gmail.com> parents: 2731 diff changeset	852
adfbb984ebbb topics: check for topic on commit before a user enters message Pulkit Goyal <7895pulkit@gmail.com> parents: 2731 diff changeset	853	(same test, checking we abort before the editor)
adfbb984ebbb topics: check for topic on commit before a user enters message Pulkit Goyal <7895pulkit@gmail.com> parents: 2731 diff changeset	854
adfbb984ebbb topics: check for topic on commit before a user enters message Pulkit Goyal <7895pulkit@gmail.com> parents: 2731 diff changeset	855	$ EDITOR=cat hg ci -m "Added a" --edit
adfbb984ebbb topics: check for topic on commit before a user enters message Pulkit Goyal <7895pulkit@gmail.com> parents: 2731 diff changeset	856	abort: no active topic
adfbb984ebbb topics: check for topic on commit before a user enters message Pulkit Goyal <7895pulkit@gmail.com> parents: 2731 diff changeset	857	(set a current topic or use '--config experimental.enforce-topic=no' to commit without a topic)
adfbb984ebbb topics: check for topic on commit before a user enters message Pulkit Goyal <7895pulkit@gmail.com> parents: 2731 diff changeset	858	[255]
2718 b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	859	$ hg ci -m "added a" --config experimental.enforce-topic=no
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	860	$ hg log
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	861	changeset: 0:a154386e50d1
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	862	tag: tip
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	863	user: test
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	864	date: Thu Jan 01 00:00:00 1970 +0000
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	865	summary: added a
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	866
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	867	$ cd ..

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Fri, 14 Jul 2017 00:58:14 +0200
changeset 2734	39c3b2b5deb0
parent 2733	adfbb984ebbb
child 2747	9fd6c8efda5b
permissions	-rw-r--r--