evolve: tests/test-topic.t annotate

annotate tests/test-topic.t @ 2934:e16981ccfca9 default tip

readme: mention compatibility with future 4.4

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Fri, 15 Sep 2017 16:28:59 +0200
parents	06844693bb21
children

rev	line source
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:
2923 8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	22
8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	23 hg topic --rev <related revset> --clear
2717 ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	24
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	25 Change topic on some revisions:
2923 8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	26
8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	27 hg topic <newtopicname> --rev <related revset>
2717 ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	28
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	29 Clear current topic:
2923 8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	30
8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	31 hg topic --clear
2717 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 Set current topic:
2923 8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	34
8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	35 hg topic <topicname>
2717 ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	36
ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	37 List of topics:
2923 8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	38
8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	39 hg topics
2717 ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	40
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	41 List of topics with their last touched time sorted according to it:
2923 8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	42
8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2898 diff changeset	43 hg topic --age
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	44
2717 ed45a5fb4452 topics: update the help for `hg topics` describing ways to use the command Pulkit Goyal <7895pulkit@gmail.com> parents: 2712 diff changeset	45 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	46
2869 b629874ccaac topics: allow use a --current when setting a topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2868 diff changeset	47 The '--current' flag helps to take active topic into account. For example,
b629874ccaac topics: allow use a --current when setting a topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2868 diff changeset	48 if you want to set the topic on all the draft changesets to the active
b629874ccaac topics: allow use a --current when setting a topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2868 diff changeset	49 topic, you can do: 'hg topic -r "draft()" --current'
b629874ccaac topics: allow use a --current when setting a topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2868 diff changeset	50
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1953 diff changeset	51 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	52 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	53
2898 3dfc88c06378 topic: support --rev argument and properly process then as user input Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2889 diff changeset	54 options ([+] can be repeated):
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	55
2898 3dfc88c06378 topic: support --rev argument and properly process then as user input Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2889 diff changeset	56 --clear clear active topic if any
3dfc88c06378 topic: support --rev argument and properly process then as user input Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2889 diff changeset	57 -r --rev REV [+] revset of existing revisions
3dfc88c06378 topic: support --rev argument and properly process then as user input Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2889 diff changeset	58 -l --list show the stack of changeset in the topic
3dfc88c06378 topic: support --rev argument and properly process then as user input Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2889 diff changeset	59 --age show when you last touched the topics
3dfc88c06378 topic: support --rev argument and properly process then as user input Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2889 diff changeset	60 --current display the current topic only
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	61
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	62 (some details hidden, use --verbose to show complete help)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	63 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	64
1851 67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	65 Test topics interaction with evolution:
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	66
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	67 $ hg topics --config experimental.evolution=
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	68 $ hg topics --config experimental.evolution= --rev . bob
a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	69 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	70 [255]
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	71
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	72 Create some changes:
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	73
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	74 $ for x in alpha beta gamma delta ; do
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	75 > echo file $x >> $x
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	76 > hg addremove
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	77 > hg ci -m "Add file $x"
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	78 > done
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	79 adding alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	80 adding beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	81 adding gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	82 adding delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	83
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	84 Still no topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	85 $ hg topics
2867 5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	86 $ hg topics --current
5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	87 no active topic
5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	88 [1]
5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	89 $ hg topics --current somerandomtopic
5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	90 abort: cannot use --current when setting a topic
5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	91 [255]
5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	92 $ hg topics --current --clear
5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	93 abort: cannot use --current and --clear
5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	94 [255]
2868 e46b68547017 topic: make --clear + topicname invalid Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2867 diff changeset	95 $ hg topics --clear somerandomtopic
e46b68547017 topic: make --clear + topicname invalid Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2867 diff changeset	96 abort: cannot use --clear when setting a topic
e46b68547017 topic: make --clear + topicname invalid Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2867 diff changeset	97 [255]
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	98
2888 aa5268900ba1 topic: add test showing no restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2869 diff changeset	99 Trying some invalid topicnames
aa5268900ba1 topic: add test showing no restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2869 diff changeset	100
aa5268900ba1 topic: add test showing no restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2869 diff changeset	101 $ hg topic '.'
2889 31cbace4c0f1 topics: make sure we have some restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2888 diff changeset	102 abort: the name '.' is reserved
31cbace4c0f1 topics: make sure we have some restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2888 diff changeset	103 [255]
2888 aa5268900ba1 topic: add test showing no restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2869 diff changeset	104 $ hg topic null
2889 31cbace4c0f1 topics: make sure we have some restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2888 diff changeset	105 abort: the name 'null' is reserved
31cbace4c0f1 topics: make sure we have some restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2888 diff changeset	106 [255]
2888 aa5268900ba1 topic: add test showing no restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2869 diff changeset	107 $ hg topic tip
2889 31cbace4c0f1 topics: make sure we have some restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2888 diff changeset	108 abort: the name 'tip' is reserved
31cbace4c0f1 topics: make sure we have some restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2888 diff changeset	109 [255]
2888 aa5268900ba1 topic: add test showing no restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2869 diff changeset	110 $ hg topic 12345
2889 31cbace4c0f1 topics: make sure we have some restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2888 diff changeset	111 abort: cannot use an integer as a name
31cbace4c0f1 topics: make sure we have some restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2888 diff changeset	112 [255]
2888 aa5268900ba1 topic: add test showing no restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2869 diff changeset	113 $ hg topic ' '
2889 31cbace4c0f1 topics: make sure we have some restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2888 diff changeset	114 abort: topic name cannot consist entirely of whitespaces
31cbace4c0f1 topics: make sure we have some restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2888 diff changeset	115 [255]
2888 aa5268900ba1 topic: add test showing no restrictions on topic names Pulkit Goyal <7895pulkit@gmail.com> parents: 2869 diff changeset	116
1852 3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	117 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	118
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	119 $ echo stuff >> alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	120 $ 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	121
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	122
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	123 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	124 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	125 HG: --
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	126 HG: user: test
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	127 HG: topic 'topicflag'
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	128 HG: branch 'default'
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	129 HG: changed alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	130 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	131 [255]
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	132 $ hg revert alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	133 $ hg topic
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	134 * topicflag
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	135
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	136 Make a topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	137 $ hg topic narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	138 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	139 * narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	140 $ echo topic work >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	141 $ hg ci -m 'start on narf'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	142 $ hg co .^
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	143 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	144 $ hg topic fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	145 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	146 * fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	147 narf
2867 5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	148 $ hg topics --current
5c0b6af37b21 topics: add a current flag to display current topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2860 diff changeset	149 fran
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	150 $ echo >> fran work >> beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	151 $ hg ci -m 'start on fran'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	152 $ hg co narf
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	153 switching to topic narf
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	154 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	155 $ hg topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	156 fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	157 * narf
1869 995617c7f2fc template: test that topic is accessible through template Pierre-Yves David <pierre-yves.david@fb.com> parents: 1868 diff changeset	158 $ 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	159 narf
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	160 $ echo 'narf!!!' >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	161 $ hg ci -m 'narf!'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	162 $ hg log -G
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	163 @ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	164 \| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	165 \| topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	166 \| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	167 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	168 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	169 \| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	170 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	171 \| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	172 \| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	173 \| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	174 \| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	175 \| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	176 \| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	177 \| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	178 o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	179 \|/ topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	180 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	181 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	182 \| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	183 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	184 o changeset: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	185 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	186 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	187 \| summary: Add file delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	188 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	189 o changeset: 2:15d1eb11d2fa
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	190 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	191 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	192 \| summary: Add file gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	193 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	194 o changeset: 1:c692ea2c9224
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: Add file beta
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: 0:c2b7d2f7d14b
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: Add file alpha
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
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	205 Exchanging of topics:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	206 $ cd ..
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	207 $ hg init brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	208 $ hg -R pinky push -r 4 brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	209 pushing to brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	210 searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	211 adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	212 adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	213 adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	214 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	215
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	216 Export
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	217
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	218 $ hg -R pinky export
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	219 # HG changeset patch
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	220 # User test
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	221 # Date 0 0
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	222 # 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	223 # Node ID 7c34953036d6a36eae468c550d0592b89ee8bffc
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	224 # Parent fb147b0b417c25ca15547cd945acf51cf8dcaf02
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	225 # EXP-Topic narf
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	226 narf!
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	227
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	228 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	229 --- 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	230 +++ 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	231 @@ -1,2 +1,3 @@
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	232 file alpha
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	233 topic work
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	234 +narf!!!
1867 c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	235
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	236 Import
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	237
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	238 $ 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	239 $ 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	240 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	241 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	242 $ 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	243 applying narf.diff
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	244 $ hg -R pinky log -r .
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	245 changeset: 6:7c34953036d6
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	246 tag: tip
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	247 topic: narf
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	248 parent: 4:fb147b0b417c
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	249 user: test
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	250 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	251 summary: narf!
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	252
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	253 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	254 draft, so we won't see that topic name anymore:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	255
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	256 $ hg log -R pinky -G
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	257 @ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	258 \| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	259 \| topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	260 \| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	261 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	262 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	263 \| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	264 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	265 \| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	266 \| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	267 \| \| parent: 3:a53952faf762
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: start on fran
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 o changeset: 3:a53952faf762
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: Add file delta
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 o changeset: 2:15d1eb11d2fa
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	283 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	284 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	285 \| summary: Add file gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	286 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	287 o changeset: 1:c692ea2c9224
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	288 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	289 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	290 \| summary: Add file beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	291 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	292 o changeset: 0:c2b7d2f7d14b
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	293 user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	294 date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	295 summary: Add file alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	296
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	297 $ cd brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	298 $ hg co tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	299 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	300
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	301 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	302
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	303 $ hg topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	304 $ echo what >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	305 $ hg topic query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	306 $ hg ci -m 'what is narf, pinky?'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	307 $ hg log -Gl2
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	308 @ changeset: 5:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	309 \| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	310 \| topic: query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	311 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	312 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	313 \| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	314 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	315 o changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	316 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	317 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	318 \| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	319 \|
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	320
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	321 $ hg push -f ../pinky -r query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	322 pushing to ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	323 searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	324 adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	325 adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	326 adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	327 added 1 changesets with 1 changes to 1 files (+1 heads)
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	328
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	329 $ hg -R ../pinky log -Gl 4
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	330 o changeset: 7:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	331 \| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	332 \| topic: query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	333 \| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	334 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	335 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	336 \| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	337 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	338 \| @ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	339 \|/ topic: narf
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 \|
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	357
1839 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 $ cd ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	361 $ hg co query
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	362 switching to topic query
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	363 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	364 $ echo answer >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	365 $ hg ci -m 'Narf is like `zort` or `poit`!'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	366 $ hg merge narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	367 merging alpha
1868 5cdd5e0a421c test: adapt to newer mercurial Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	368 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	369 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	370 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	371 [1]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	372 $ hg revert -r narf alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	373 $ hg resolve -m alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	374 (no more unresolved files)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	375 $ hg topic narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	376 $ hg ci -m 'Finish narf'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	377 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	378 fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	379 * narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	380 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	381 $ 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	382 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	383 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	384 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	385 default:query
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	386 fran
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	387 narf
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	388 query
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	389 tip
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	390 $ hg phase --public narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	391
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	392 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	393 narf commits public:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	394
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	395 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	396 fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	397 * narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	398 $ hg log -Gl 6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	399 @ changeset: 9:ae074045b7a7
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	400 \|\ tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	401 \| \| parent: 8:54c943c1c167
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	402 \| \| parent: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	403 \| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	404 \| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	405 \| \| summary: Finish narf
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 \| o changeset: 8:54c943c1c167
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	408 \| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	409 \| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	410 \| \| summary: Narf is like `zort` or `poit`!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	411 \| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	412 \| o changeset: 7:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	413 \| \| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	414 \| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	415 \| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	416 \| \| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	417 \| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	418 o \| changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	419 \|/ parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	420 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	421 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	422 \| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	423 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	424 \| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	425 \| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	426 \| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	427 \| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	428 \| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	429 \| \| summary: start on fran
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 o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	432 \|/ user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	433 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	434 \| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	435 \|
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	436
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	437 $ cd ../brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	438 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	439 * query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	440 $ hg pull ../pinky -r narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	441 pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	442 abort: unknown revision 'narf'!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	443 [255]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	444 $ hg pull ../pinky -r default
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	445 pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	446 searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	447 adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	448 adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	449 adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	450 added 3 changesets with 3 changes to 1 files
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	451 (run 'hg update' to get a working copy)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	452 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	453 * query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	454
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	455 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	456
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	457 $ hg pull ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	458 pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	459 searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	460 adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	461 adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	462 adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	463 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	464 (run 'hg heads' to see heads)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	465 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	466 fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	467 * query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	468 $ hg log -Gr 'draft()'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	469 o changeset: 9:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	470 \| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	471 \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	472 \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	473 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	474 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	475 \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	476 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	477
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	478 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	479 disappear:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	480
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	481 $ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	482 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	483 fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	484
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	485 --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	486
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	487 $ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	488
1843 0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	489 Topic revset
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	490 $ hg log -r 'topic()' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	491 o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	492 \| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	493 \| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	494 \| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	495 \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	496 \| 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	497 \| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	498 \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	499 $ hg log -r 'not topic()' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	500 o changeset: 8:ae074045b7a7
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	501 \|\ parent: 7:54c943c1c167
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	502 \| \| parent: 6:7c34953036d6
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	503 \| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	504 \| \| 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	505 \| \| summary: Finish narf
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	506 \| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	507 \| o changeset: 7:54c943c1c167
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	508 \| \| parent: 5:c01515cfc331
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	509 \| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	510 \| \| 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	511 \| \| 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	512 \| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	513 o \| changeset: 6:7c34953036d6
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	514 \| \| parent: 4:fb147b0b417c
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	515 \| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	516 \| \| 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	517 \| \| summary: narf!
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	518 \| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	519 \| @ changeset: 5:c01515cfc331
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: what is narf, pinky?
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 o changeset: 4:fb147b0b417c
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	525 \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	526 \| 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	527 \| summary: start on narf
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	528 \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	529 o changeset: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	530 \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	531 \| 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	532 \| summary: Add file delta
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	533 \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	534 o changeset: 2:15d1eb11d2fa
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	535 \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	536 \| 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	537 \| summary: Add file gamma
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	538 \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	539 o changeset: 1:c692ea2c9224
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	540 \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	541 \| 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	542 \| summary: Add file beta
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	543 \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	544 o changeset: 0:c2b7d2f7d14b
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	545 user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	546 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	547 summary: Add file alpha
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	548
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	549 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	550 $ hg log -r 'topic(narf)' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	551 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	552 $ 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	553 o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	554 \| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	555 \| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	556 \| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	557 \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	558 \| 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	559 \| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	560 \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	561 Exact match on fran:
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	562 $ hg log -r 'topic(fran)' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	563 o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	564 \| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	565 \| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	566 \| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	567 \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	568 \| 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	569 \| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	570 \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	571
1864 70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	572 Match current topic:
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	573 $ hg topic
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	574 fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	575 $ hg log -r 'topic(.)'
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	576 (no output is expected)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	577 $ hg co fran
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	578 switching to topic fran
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	579 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	580 $ hg log -r 'topic(.)'
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	581 changeset: 9:0469d521db49
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	582 tag: tip
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	583 topic: fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	584 parent: 3:a53952faf762
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	585 user: test
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	586 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	587 summary: start on fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	588
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	589
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	590 Deactivate the topic.
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	591 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	592 * fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	593 $ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	594 $ echo fran? >> beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	595 $ 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	596 created new head
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	597 $ hg log -Gr 'draft()'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	598 @ changeset: 10:4073470c35e1
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	599 \| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	600 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	601 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	602 \| summary: fran?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	603 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	604 o changeset: 9:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	605 \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	606 \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	607 \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	608 \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	609 \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	610 \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	611 $ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	612 fran
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	613 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	614 $ 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	615 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	616 [255]
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	617
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	618 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	619 $ 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	620 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	621 [255]
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	622
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	623 Can clear topics
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	624 $ 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	625 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	626 $ 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	627 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	628 \| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	629 \| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	630 \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	631 \| 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	632 \| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	633 \|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	634 \| @ changeset: 10:4073470c35e1
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	635 \| \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	636 \| \| date: Thu Jan 01 00:00:00 1970 +0000
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2833 diff changeset	637 \| \| instability: orphan
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	638 \| \| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	639 \| \|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	640
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	641 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	642 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	643
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	644 $ 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	645 rebasing 10:4073470c35e1 "fran?"
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	646
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	647 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	648 $ hg topic
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	649 $ hg sum
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	650 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	651 fran?
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	652 branch: default
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	653 commit: (clean)
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	654 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	655 phases: 2 draft
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	656 $ 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	657 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	658 $ 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	659 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	660 user: test
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	661 date: Thu Jan 01 00:00:00 1970 +0000
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2833 diff changeset	662 instability: orphan
2663 c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	663 summary: fran?
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	664
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	665 $ hg sum
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2833 diff changeset	666 parent: 12:18b70b8de1f0 (orphan)
2663 c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	667 fran?
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	668 branch: default
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	669 commit: (clean)
c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	670 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	671 phases: 3 draft
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2833 diff changeset	672 orphan: 1 changesets
2663 c01dc624b358 test: extra output to understand the next changeset better Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2661 diff changeset	673 $ 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	674 wat
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	675 $ 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	676 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	677 \| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	678 \| topic: wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	679 \| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	680 \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	681 \| 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	682 \| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	683 \|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	684 \| @ changeset: 12:18b70b8de1f0
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	685 \| \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	686 \| \| date: Thu Jan 01 00:00:00 1970 +0000
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2833 diff changeset	687 \| \| instability: orphan
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	688 \| \| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	689 \| \|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	690
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	691 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	692 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	693
2661 914757c70217 tests: expand output to check topic activation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2649 diff changeset	694 $ 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	695 wat
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	696 $ 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	697 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	698 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	699 $ 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	700 wat
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	701
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	702 $ 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	703 @ changeset: 14:45358f7a5892
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	704 \| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	705 \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	706 \| 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	707 \| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	708 \|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	709 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	710 \| topic: wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	711 \| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	712 \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	713 \| 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	714 \| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	715 \|
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	716
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	717 Amend a topic
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	718
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	719 $ hg topic watwat
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	720 $ hg ci --amend
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	721 $ hg log -Gr 'draft()'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	722 @ changeset: 15:6c40a4c21bbe
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	723 \| tag: tip
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	724 \| topic: watwat
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	725 \| parent: 13:686a642006db
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	726 \| user: test
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	727 \| 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	728 \| summary: fran?
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	729 \|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	730 o changeset: 13:686a642006db
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	731 \| topic: wat
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	732 \| parent: 3:a53952faf762
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	733 \| user: test
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	734 \| 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	735 \| summary: start on fran
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	736 \|
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	737
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	738 Clear and amend:
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	739
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	740 $ hg topic --clear
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	741 $ hg ci --amend
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	742 $ hg log -r .
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	743 changeset: 16:0f9cd5070654
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	744 tag: tip
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	745 parent: 13:686a642006db
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	746 user: test
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	747 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	748 summary: fran?
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	749
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	750 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	751 $ 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	752 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	753 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	754
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	755 Testing issue5441
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	756 $ hg co 17
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	757 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	758 $ hg log -Gr 'draft()'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	759 @ changeset: 17:980a0f608481
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	760 \| tag: tip
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	761 \| topic: watwat
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	762 \| 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	763 \| user: test
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	764 \| 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	765 \| summary: fran?
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	766 \|
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	767 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	768 \| topic: wat
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	769 \| parent: 3:a53952faf762
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	770 \| user: test
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	771 \| 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	772 \| 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	773 \|
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	774
2869 b629874ccaac topics: allow use a --current when setting a topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2868 diff changeset	775 Using the current flag
b629874ccaac topics: allow use a --current when setting a topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2868 diff changeset	776
b629874ccaac topics: allow use a --current when setting a topic Pulkit Goyal <7895pulkit@gmail.com> parents: 2868 diff changeset	777 $ hg topic changewat
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	778 $ hg topics --rev '13::17' --current
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	779 changed topic on 2 changes
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	780
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	781 $ hg log -Gr 'draft()'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	782 @ changeset: 19:56c83be6105f
2623 a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	783 \| tag: tip
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	784 \| topic: changewat
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	785 \| user: test
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	786 \| 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	787 \| summary: fran?
a263f4c0f2ee tests: add a test to show issue5441 in test-topic.t Pulkit Goyal <7895pulkit@gmail.com> parents: 2045 diff changeset	788 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	789 o changeset: 18:ceba5be9d56f
2624 fd602980f7ee topics: make sure we commit on new parents while changing topics (issue5441) Pulkit Goyal <7895pulkit@gmail.com> parents: 2623 diff changeset	790 \| topic: changewat
fd602980f7ee topics: make sure we commit on new parents while changing topics (issue5441) Pulkit Goyal <7895pulkit@gmail.com> parents: 2623 diff changeset	791 \| 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	792 \| user: test
fd602980f7ee topics: make sure we commit on new parents while changing topics (issue5441) Pulkit Goyal <7895pulkit@gmail.com> parents: 2623 diff changeset	793 \| 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	794 \| 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	795 \|
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	796
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	797 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	798
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	799 $ 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	800 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	801 $ 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	802 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	803 $ 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	804 $ hg ci -m gamma
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	805
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	806 $ hg log -Gr 'draft()'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	807 @ changeset: 20:0d3d805542b4
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	808 \| tag: tip
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	809 \| topic: changewat
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	810 \| parent: 18:ceba5be9d56f
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	811 \| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	812 \| 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	813 \| summary: gamma
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	814 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	815 \| o changeset: 19:56c83be6105f
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	816 \|/ topic: changewat
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	817 \| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	818 \| 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	819 \| summary: fran?
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	820 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	821 o changeset: 18:ceba5be9d56f
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	822 \| topic: changewat
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	823 \| 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	824 \| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	825 \| 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	826 \| 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	827 \|
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	828
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	829 $ 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	830 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	831 changed topic on 3 changes
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	832
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	833 $ hg log -Gr 'draft()'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	834 @ changeset: 23:729ed5717393
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	835 \| tag: tip
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	836 \| topic: changewut
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	837 \| parent: 21:62e49f09f883
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	838 \| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	839 \| 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	840 \| summary: gamma
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	841 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	842 \| o changeset: 22:369c6e2e5474
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	843 \|/ topic: changewut
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	844 \| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	845 \| 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	846 \| summary: fran?
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	847 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2923 diff changeset	848 o changeset: 21:62e49f09f883
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	849 \| topic: changewut
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	850 \| 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	851 \| user: test
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	852 \| 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	853 \| 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	854 \|
2712 f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	855
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	856 Testing for updating to t0
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	857 ==========================
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	858
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	859 $ hg stack
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	860 ### topic: changewut (2 heads)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	861 ### branch: default, 5 behind
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	862 t3: fran?
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	863 t1^ start on fran (base)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	864 t2@ gamma (current)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	865 t1: start on fran
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	866 t0^ Add file delta (base)
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	867
2712 f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	868 $ hg up t0
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	869 preserving the current topic 'changewut'
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	870 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	871
2712 f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	872 $ hg topic
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	873 * changewut
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	874 $ hg stack
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	875 ### topic: changewut (2 heads)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	876 ### branch: default, 5 behind
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	877 t3: fran?
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	878 t1^ start on fran (base)
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	879 t2: gamma
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	880 t1: start on fran
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2691 diff changeset	881 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	882
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	883 $ 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	884 * 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	885
2718 b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	886 $ cd ..
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	887
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	888 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	889 ======================================================
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	890
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	891 $ hg init ponky
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	892 $ cd ponky
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	893 $ cat <<EOF >> .hg/hgrc
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	894 > [phases]
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	895 > publish=false
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	896 > EOF
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	897 $ cat <<EOF >> $HGRCPATH
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	898 > [experimental]
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	899 > enforce-topic = yes
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	900 > EOF
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	901 $ touch a b c d
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	902 $ hg add a
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	903 $ hg ci -m "Added a"
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	904 abort: no active topic
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	905 (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	906 [255]
2733 adfbb984ebbb topics: check for topic on commit before a user enters message Pulkit Goyal <7895pulkit@gmail.com> parents: 2731 diff changeset	907
adfbb984ebbb topics: check for topic on commit before a user enters message Pulkit Goyal <7895pulkit@gmail.com> parents: 2731 diff changeset	908 (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	909
adfbb984ebbb topics: check for topic on commit before a user enters message Pulkit Goyal <7895pulkit@gmail.com> parents: 2731 diff changeset	910 $ 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	911 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	912 (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	913 [255]
2718 b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	914 $ 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	915 $ hg log
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	916 changeset: 0:a154386e50d1
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	917 tag: tip
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	918 user: test
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	919 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	920 summary: added a
b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	921
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	922 Testing the --age flag for `hg topics`
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	923 ======================================
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	924
2747 9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	925 $ hg topic topic1970 --rev 0
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	926 switching to topic topic1970
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	927 changed topic on 1 changes
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	928
2747 9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	929 $ hg add b
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	930 $ hg topic topic1990
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	931 $ hg ci -m "Added b" --config devel.default-date="631152000 0"
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	932 $ hg add c
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	933 $ hg topic topic2010
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	934 $ hg ci -m "Added c" --config devel.default-date="1262304000 0"
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	935
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	936 $ hg log -G
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	937 @ changeset: 3:9048b194797d
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	938 \| tag: tip
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	939 \| topic: topic2010
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	940 \| user: test
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	941 \| date: Fri Jan 01 00:00:00 2010 +0000
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	942 \| summary: Added c
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	943 \|
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	944 o changeset: 2:186d493c7f8d
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	945 \| topic: topic1990
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	946 \| user: test
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	947 \| date: Mon Jan 01 00:00:00 1990 +0000
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	948 \| summary: Added b
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	949 \|
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	950 o changeset: 1:e5a30a141954
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	951 topic: topic1970
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	952 parent: -1:000000000000
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	953 user: test
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	954 date: Thu Jan 01 00:00:00 1970 +0000
27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	955 summary: added a
2747 9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	956
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	957 $ hg topics
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	958 topic1970
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	959 topic1990
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	960 * topic2010
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	961
2747 9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	962 $ hg topics --age
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	963 * topic2010 (2010-01-01)
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	964 topic1990 (1990-01-01)
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	965 topic1970 (1970-01-01)
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	966
2747 9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	967 $ hg up topic1970
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	968 switching to topic topic1970
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	969 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
2860 27ae7afd9a2a tests: add whitespaces in test-topic.t to make it more readable Pulkit Goyal <7895pulkit@gmail.com> parents: 2834 diff changeset	970
2747 9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	971 $ hg topics --age
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	972 topic2010 (2010-01-01)
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	973 topic1990 (1990-01-01)
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	974 * topic1970 (1970-01-01)
9fd6c8efda5b topics: add a test demonstarting sorting of topics by time using --age Pulkit Goyal <7895pulkit@gmail.com> parents: 2733 diff changeset	975
2718 b6fa7b3e13d4 topics: add a config knob to forbid untopiced commit Pulkit Goyal <7895pulkit@gmail.com> parents: 2717 diff changeset	976 $ cd ..

Mercurial > evolve

annotate tests/test-topic.t @ 2934:e16981ccfca9 default tip