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

1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	1	$ . "$TESTDIR/testlib"
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
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	9
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	10	$ hg help topics
1847 9fa5b8f4e98e topics: add command summary Matt Mackall <mpm@selenic.com> parents: 1844 diff changeset	11	hg topics [TOPIC]
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	12
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	13	View current topic, set current topic, or see all topics.
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	options:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	16
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	17	--clear clear active topic if any
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	18	--change VALUE revset of existing revisions to change topic
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	19
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	20	(some details hidden, use --verbose to show complete help)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	21	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	22
1851 67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	23	Test topics interaction with evolution:
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	24
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	25	$ hg topics --config experimental.evolution=
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	26	$ hg topics --config experimental.evolution= --change . bob
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	27	abort: must have obsolete enabled to use --change
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	28	[255]
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	29
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	30	Create some changes:
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	31
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	32	$ for x in alpha beta gamma delta ; do
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	33	> echo file $x >> $x
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	34	> hg addremove
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	35	> hg ci -m "Add file $x"
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	36	> done
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	37	adding alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	38	adding beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	39	adding gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	40	adding delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	41
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	42	Still no topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	43	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	44
1852 3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	45	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	46
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	47	$ echo stuff >> alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	48	$ 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	49
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	50
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	51	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	52	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	53	HG: --
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	54	HG: user: test
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	55	HG: topic 'topicflag'
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	56	HG: branch 'default'
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	57	HG: changed alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	58	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	59	[255]
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	60	$ hg revert alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	61	$ hg topic
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	62	* topicflag
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	63
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	64	Make a topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	65	$ hg topic narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	66	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	67	* narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	68	$ echo topic work >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	69	$ hg ci -m 'start on narf'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	70	$ hg co .^
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	71	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	72	$ hg topic fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	73	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	74	* fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	75	narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	76	$ echo >> fran work >> beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	77	$ hg ci -m 'start on fran'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	78	created new head
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	79	$ hg co narf
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	80	switching to topic narf
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	81	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	82	$ hg topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	83	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	84	* narf
1869 995617c7f2fc template: test that topic is accessible through template Pierre-Yves David <pierre-yves.david@fb.com> parents: 1868 diff changeset	85	$ 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	86	narf
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	87	$ echo 'narf!!!' >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	88	$ hg ci -m 'narf!'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	89	$ hg log -G
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	90	@ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	91	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	92	\| topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	93	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	94	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	95	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	96	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	97	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	98	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	99	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	100	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	101	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	102	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	103	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	104	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	105	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	106	\|/ topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	107	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	108	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	109	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	110	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	111	o changeset: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	112	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	113	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	114	\| summary: Add file delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	115	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	116	o changeset: 2:15d1eb11d2fa
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	117	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	118	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	119	\| summary: Add file gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	120	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	121	o changeset: 1:c692ea2c9224
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	122	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	123	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	124	\| summary: Add file beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	125	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	126	o changeset: 0:c2b7d2f7d14b
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	127	user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	128	date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	129	summary: Add file alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	130
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	131
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	132	Exchanging of topics:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	133	$ cd ..
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	134	$ hg init brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	135	$ hg -R pinky push -r 4 brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	136	pushing to brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	137	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	138	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	139	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	140	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	141	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	142
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	143	Export
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	144
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	145	$ hg -R pinky export
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	146	# HG changeset patch
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	147	# User test
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	148	# Date 0 0
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	149	# 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	150	# Node ID 7c34953036d6a36eae468c550d0592b89ee8bffc
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	151	# Parent fb147b0b417c25ca15547cd945acf51cf8dcaf02
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	152	# EXP-Topic narf
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	153	narf!
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	154
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	155	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	156	--- 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	157	+++ 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	158	@@ -1,2 +1,3 @@
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	159	file alpha
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	160	topic work
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	161	+narf!!!
1867 c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	162
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	163	Import
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	164
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	165	$ 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	166	$ 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	167	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	168	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	169	$ 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	170	applying narf.diff
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	171	$ hg -R pinky log -r .
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	172	changeset: 6:7c34953036d6
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	173	tag: tip
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	174	topic: narf
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	175	parent: 4:fb147b0b417c
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	176	user: test
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	177	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	178	summary: narf!
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	179
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	180	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	181	draft, so we won't see that topic name anymore:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	182
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	183	$ hg log -R pinky -G
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	184	@ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	185	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	186	\| topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	187	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	188	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	189	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	190	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	191	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	192	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	193	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	194	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	195	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	196	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	197	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	198	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	199	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	200	\|/ user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	201	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	202	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	203	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	204	o changeset: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	205	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	206	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	207	\| summary: Add file delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	208	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	209	o changeset: 2:15d1eb11d2fa
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	210	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	211	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	212	\| summary: Add file gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	213	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	214	o changeset: 1:c692ea2c9224
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	215	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	216	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	217	\| summary: Add file beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	218	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	219	o changeset: 0:c2b7d2f7d14b
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	220	user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	221	date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	222	summary: Add file alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	223
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	224	$ cd brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	225	$ hg co tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	226	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	227
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	228	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	229
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	230	$ hg topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	231	$ echo what >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	232	$ hg topic query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	233	$ hg ci -m 'what is narf, pinky?'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	234	$ hg log -Gl2
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	235	@ changeset: 5:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	236	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	237	\| topic: query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	238	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	239	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	240	\| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	241	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	242	o changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	243	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	244	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	245	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	246	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	247	$ hg push -f ../pinky -r query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	248	pushing to ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	249	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	250	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	251	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	252	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	253	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	254	$ hg -R ../pinky log -Gl 4
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	255	o changeset: 7:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	256	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	257	\| topic: query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	258	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	259	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	260	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	261	\| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	262	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	263	\| @ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	264	\|/ topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	265	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	266	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	267	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	268	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	269	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	270	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	271	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	272	\| \| parent: 3:a53952faf762
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 fran
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	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	278	\|/ user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	279	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	280	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	281	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	282	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	283	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	284	$ cd ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	285	$ hg co query
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	286	switching to topic query
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	287	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	288	$ echo answer >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	289	$ hg ci -m 'Narf is like `zort` or `poit`!'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	290	$ hg merge narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	291	merging alpha
1868 5cdd5e0a421c test: adapt to newer mercurial Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	292	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	293	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	294	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	295	[1]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	296	$ hg revert -r narf alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	297	$ hg resolve -m alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	298	(no more unresolved files)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	299	$ hg topic narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	300	$ hg ci -m 'Finish narf'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	301	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	302	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	303	* narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	304	query
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	305	$ hg debugnamecomplete
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	306	default
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	307	fran
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	308	narf
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	309	query
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	310	tip
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	311	$ hg phase --public narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	312
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	313	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	314	narf commits public:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	315
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	316	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	317	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	318	* narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	319	$ hg log -Gl 6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	320	@ changeset: 9:ae074045b7a7
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	321	\|\ tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	322	\| \| parent: 8:54c943c1c167
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	323	\| \| parent: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	324	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	325	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	326	\| \| summary: Finish narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	327	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	328	\| o changeset: 8:54c943c1c167
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	329	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	330	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	331	\| \| summary: Narf is like `zort` or `poit`!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	332	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	333	\| o changeset: 7:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	334	\| \| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	335	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	336	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	337	\| \| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	338	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	339	o \| changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	340	\|/ parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	341	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	342	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	343	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	344	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	345	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	346	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	347	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	348	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	349	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	350	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	351	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	352	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	353	\|/ user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	354	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	355	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	356	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	357	$ cd ../brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	358	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	359	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	360	$ hg pull ../pinky -r narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	361	pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	362	abort: unknown revision 'narf'!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	363	[255]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	364	$ hg pull ../pinky -r default
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	365	pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	366	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	367	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	368	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	369	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	370	added 3 changesets with 3 changes to 1 files
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	371	(run 'hg update' to get a working copy)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	372	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	373	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	374
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	375	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	376
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	377	$ hg pull ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	378	pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	379	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	380	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	381	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	382	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	383	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	384	(run 'hg heads' to see heads, 'hg merge' to merge)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	385	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	386	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	387	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	388	$ hg log -Gr 'draft()'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	389	o changeset: 9:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	390	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	391	\| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	392	\| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	393	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	394	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	395	\| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	396	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	397
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	398	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	399	disappear:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	400
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	401	$ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	402	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	403	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	404
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	405	--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	406
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	407	$ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	408
1843 0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	409	Topic revset
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	410	$ hg log -r 'topic()' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	411	o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	412	\| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	413	\| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	414	\| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	415	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	416	\| 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	417	\| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	418	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	419	$ hg log -r 'not topic()' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	420	o changeset: 8:ae074045b7a7
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	421	\|\ parent: 7:54c943c1c167
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	422	\| \| parent: 6:7c34953036d6
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	423	\| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	424	\| \| 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	425	\| \| summary: Finish narf
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	426	\| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	427	\| o changeset: 7:54c943c1c167
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	428	\| \| parent: 5:c01515cfc331
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	429	\| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	430	\| \| 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	431	\| \| 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	432	\| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	433	o \| changeset: 6:7c34953036d6
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	434	\| \| parent: 4:fb147b0b417c
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	435	\| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	436	\| \| 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	437	\| \| summary: narf!
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	438	\| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	439	\| @ changeset: 5:c01515cfc331
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	440	\|/ user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	441	\| 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	442	\| summary: what is narf, pinky?
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	443	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	444	o changeset: 4:fb147b0b417c
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	445	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	446	\| 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	447	\| summary: start on narf
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	448	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	449	o changeset: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	450	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	451	\| 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	452	\| summary: Add file delta
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	453	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	454	o changeset: 2:15d1eb11d2fa
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	455	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	456	\| 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	457	\| summary: Add file gamma
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	458	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	459	o changeset: 1:c692ea2c9224
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	460	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	461	\| 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	462	\| summary: Add file beta
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	463	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	464	o changeset: 0:c2b7d2f7d14b
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	465	user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	466	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	467	summary: Add file alpha
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	468
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	469	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	470	$ hg log -r 'topic(narf)' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	471	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	472	$ 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	473	o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	474	\| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	475	\| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	476	\| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	477	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	478	\| 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	479	\| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	480	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	481	Exact match on fran:
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	482	$ hg log -r 'topic(fran)' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	483	o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	484	\| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	485	\| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	486	\| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	487	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	488	\| 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	489	\| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	490	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	491
1864 70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	492	Match current topic:
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	493	$ hg topic
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	494	fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	495	$ hg log -r 'topic(.)'
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	496	(no output is expected)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	497	$ hg co fran
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	498	switching to topic fran
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	499	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	500	$ hg log -r 'topic(.)'
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	501	changeset: 9:0469d521db49
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	502	tag: tip
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	503	topic: fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	504	parent: 3:a53952faf762
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	505	user: test
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	506	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	507	summary: start on fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	508
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	509
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	510	Deactivate the topic.
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	511	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	512	* fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	513	$ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	514	$ echo fran? >> beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	515	$ hg ci -m 'fran?'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	516	$ hg log -Gr 'draft()'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	517	@ changeset: 10:4073470c35e1
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	518	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	519	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	520	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	521	\| summary: fran?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	522	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	523	o changeset: 9:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	524	\| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	525	\| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	526	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	527	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	528	\| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	529	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	530	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	531	fran
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	532	Changing topic fails if we don't give a topic
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	533	$ hg topic --change 9
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	534	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	535	[255]
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	536
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	537	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	538	$ hg topic --change 1:: --clear
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	539	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	540	[255]
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	541
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	542	Can clear topics
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	543	$ hg topic --change 9 --clear
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	544	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	545	please run hg evolve --rev "not topic()" now
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	546	$ hg log -Gr 'draft() and not obsolete()'
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	547	o changeset: 11:783930e1d79e
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	548	\| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	549	\| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	550	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	551	\| 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	552	\| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	553	\|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	554	\| @ changeset: 10:4073470c35e1
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	555	\| \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	556	\| \| 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	557	\| \| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	558	\| \|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	559
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	560	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	561	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	562
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	563	$ 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	564	rebasing 10:4073470c35e1 "fran?"
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	565
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	566	Can add a topic to an existing change
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	567	$ hg topic --change 11 wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	568	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	569	please run hg evolve --rev "topic(wat)" now
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	570	$ hg log -Gr 'draft() and not obsolete()'
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	571	o changeset: 13:d91cd8fd490e
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	572	\| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	573	\| topic: wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	574	\| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	575	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	576	\| 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	577	\| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	578	\|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	579	\| @ changeset: 12:d9e32f4c4806
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	580	\| \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	581	\| \| 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	582	\| \| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	583	\| \|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	584
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	585	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	586	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	587
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	588	$ 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	589	rebasing 12:d9e32f4c4806 "fran?"
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	590
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	591	$ hg log -Gr 'draft()'
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	592	@ changeset: 14:cf24ad8bbef5
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	593	\| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	594	\| topic: wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	595	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	596	\| 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	597	\| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	598	\|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	599	o changeset: 13:d91cd8fd490e
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	600	\| topic: wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	601	\| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	602	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	603	\| 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	604	\| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	605	\|
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	606
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	607	Amend a topic
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	608
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	609	$ hg topic watwat
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	610	$ hg ci --amend
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	611	$ hg log -Gr 'draft()'
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	612	@ changeset: 16:893ffcf66c1f
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	613	\| tag: tip
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	614	\| topic: watwat
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	615	\| parent: 13:d91cd8fd490e
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	616	\| user: test
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	617	\| 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	618	\| summary: fran?
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	619	\|
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	620	o changeset: 13:d91cd8fd490e
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	621	\| topic: wat
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	622	\| parent: 3:a53952faf762
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	623	\| user: test
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	624	\| 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	625	\| summary: start on fran
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	626	\|
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	627
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	628	Clear and amend:
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	629
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	630	$ hg topic --clear
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	631	$ hg ci --amend
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	632	$ hg log -r .
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	633	changeset: 18:a13639e22b65
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	634	tag: tip
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	635	parent: 13:d91cd8fd490e
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	636	user: test
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	637	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	638	summary: fran?
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	639
1874 ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1869 diff changeset	640	Readding the same topic with topic --change should work:
ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1869 diff changeset	641	$ hg topic --change . watwat
ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1869 diff changeset	642	changed topic on 1 changes

author	Augie Fackler <raf@durin42.com>
	Mon, 14 Mar 2016 20:17:18 -0400
changeset 1883	ebf146c77709
parent 1874	ec28b6c3414a
child 1885	d49f75eab6a3
permissions	-rw-r--r--