Mercurial > evolve
annotate tests/test-topic.t @ 6893:858b4ca88ea7 stable
tests: check that installed evolve works in test-version-install.t
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sun, 06 Oct 2024 20:29:03 +0400 |
parents | 1dc008b6ad21 |
children | 196babdbb593 755bb6998051 237f99ee3d64 |
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 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
3 $ hg init pinky |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
4 $ cd pinky |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
5 $ cat <<EOF >> .hg/hgrc |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
6 > [phases] |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
7 > publish=false |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
8 > EOF |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
9 |
3763
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
10 $ hg help -e topic |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
11 topic extension - support for topic branches |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
12 |
5798
87006dcf2bb7
doc: change topic phrase 'disappear' to 'fade out'
Chuck Tuffli <chuck@tuffli.net>
parents:
5722
diff
changeset
|
13 Topic branches are lightweight branches which fade out when changes are |
3763
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
14 finalized (move to the public phase). |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
15 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
16 Compared to bookmark, topic is reference carried by each changesets of the |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
17 series instead of just the single head revision. Topic are quite similar to |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
18 the way named branch work, except they eventually fade away when the changeset |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
19 becomes part of the immutable history. Changeset can belong to both a topic |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
20 and a named branch, but as long as it is mutable, its topic identity will |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
21 prevail. As a result, default destination for 'update', 'merge', etc... will |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
22 take topic into account. When a topic is active these operations will only |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
23 consider other changesets on that topic (and, in some occurrence, bare |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
24 changeset on same branch). When no topic is active, changeset with topic will |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
25 be ignored and only bare one on the same branch will be taken in account. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
26 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
27 There is currently two commands to be used with that extension: 'topics' and |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
28 'stack'. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
29 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
30 The 'hg topics' command is used to set the current topic, change and list |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
31 existing one. 'hg topics --verbose' will list various information related to |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
32 each topic. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
33 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
34 The 'stack' will show you information about the stack of commit belonging to |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
35 your current topic. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
36 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
37 Topic is offering you aliases reference to changeset in your current topic |
4069
a93b74f745a6
topic: update other occurrence of 't0' is 's0' in the code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4067
diff
changeset
|
38 stack as 's#'. For example, 's1' refers to the root of your stack, 's2' to the |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4062
diff
changeset
|
39 second commits, etc. The 'hg stack' command show these number. 's0' can be |
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4062
diff
changeset
|
40 used to refer to the parent of the topic root. Updating using 'hg up s0' will |
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4062
diff
changeset
|
41 keep the topic active. |
3763
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
42 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
43 Push behavior will change a bit with topic. When pushing to a publishing |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
44 repository the changesets will turn public and the topic data on them will |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
45 fade away. The logic regarding pushing new heads will behave has before, |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
46 ignore any topic related data. When pushing to a non-publishing repository |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
47 (supporting topic), the head checking will be done taking topic data into |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
48 account. Push will complain about multiple heads on a branch if you push |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
49 multiple heads with no topic information on them (or multiple public heads). |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
50 But pushing a new topic will not requires any specific flag. However, pushing |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
51 multiple heads on a topic will be met with the usual warning. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
52 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
53 The 'evolve' extension takes 'topic' into account. 'hg evolve --all' will |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
54 evolve all changesets in the active topic. In addition, by default. 'hg next' |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
55 and 'hg prev' will stick to the current topic. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
56 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
57 Be aware that this extension is still an experiment, commands and other |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
58 features are likely to be change/adjusted/dropped over time as we refine the |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
59 concept. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
60 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
61 topic-mode |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
62 ========== |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
63 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
64 The topic extension can be configured to ensure the user do not forget to add |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
65 a topic when committing a new topic: |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
66 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
67 [experimental] |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
68 # behavior when commit is made without an active topic |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
69 topic-mode = ignore # do nothing special (default) |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
70 topic-mode = warning # print a warning |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
71 topic-mode = enforce # abort the commit (except for merge) |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
72 topic-mode = enforce-all # abort the commit (even for merge) |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
73 topic-mode = random # use a randomized generated topic (except for merge) |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
74 topic-mode = random-all # use a randomized generated topic (even for merge) |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
75 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
76 Single head enforcing |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
77 ===================== |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
78 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
79 The extensions come with an option to enforce that there is only one heads for |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
80 each name in the repository at any time. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
81 |
3764
f0f9139016d8
topic: use preformatted block for config snippets documentation
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3763
diff
changeset
|
82 [experimental] |
f0f9139016d8
topic: use preformatted block for config snippets documentation
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3763
diff
changeset
|
83 enforce-single-head = yes |
3763
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
84 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
85 Publishing behavior |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
86 =================== |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
87 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
88 Topic vanish when changeset move to the public phases. Moving to the public |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
89 phase usually happens on push, but it is possible to update that behavior. The |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
90 server needs to have specific config for this. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
91 |
3765
4aabc5c8b2af
topic: dedent items about publishing behavior in docstring
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3764
diff
changeset
|
92 * everything pushed become public (the default): |
3764
f0f9139016d8
topic: use preformatted block for config snippets documentation
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3763
diff
changeset
|
93 |
5977
fa7f2e1cb504
topic: fix the help text to show how to disable publishing
Matt Harbison <matt_harbison@yahoo.com>
parents:
5798
diff
changeset
|
94 [phases] |
3765
4aabc5c8b2af
topic: dedent items about publishing behavior in docstring
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3764
diff
changeset
|
95 publish = yes |
3764
f0f9139016d8
topic: use preformatted block for config snippets documentation
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3763
diff
changeset
|
96 |
3765
4aabc5c8b2af
topic: dedent items about publishing behavior in docstring
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3764
diff
changeset
|
97 * nothing push turned public: |
3763
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
98 |
5977
fa7f2e1cb504
topic: fix the help text to show how to disable publishing
Matt Harbison <matt_harbison@yahoo.com>
parents:
5798
diff
changeset
|
99 [phases] |
3765
4aabc5c8b2af
topic: dedent items about publishing behavior in docstring
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3764
diff
changeset
|
100 publish = no |
3764
f0f9139016d8
topic: use preformatted block for config snippets documentation
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3763
diff
changeset
|
101 |
3765
4aabc5c8b2af
topic: dedent items about publishing behavior in docstring
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3764
diff
changeset
|
102 * topic branches are not published, changeset without topic are: |
3763
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
103 |
5977
fa7f2e1cb504
topic: fix the help text to show how to disable publishing
Matt Harbison <matt_harbison@yahoo.com>
parents:
5798
diff
changeset
|
104 [phases] |
3765
4aabc5c8b2af
topic: dedent items about publishing behavior in docstring
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3764
diff
changeset
|
105 publish = no |
4aabc5c8b2af
topic: dedent items about publishing behavior in docstring
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3764
diff
changeset
|
106 [experimental] |
4aabc5c8b2af
topic: dedent items about publishing behavior in docstring
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3764
diff
changeset
|
107 topic.publish-bare-branch = yes |
3763
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
108 |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
109 In addition, the topic extension adds a "--publish" flag on 'hg push'. When |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
110 used, the pushed revisions are published if the push succeeds. It also applies |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
111 to common revisions selected by the push. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
112 |
4648
493470e7a0f2
test: update output to match the parent changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4647
diff
changeset
|
113 One can prevent any publishing to happens in a repository using: |
4647
228caeb8b7af
topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4381
diff
changeset
|
114 |
4648
493470e7a0f2
test: update output to match the parent changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4647
diff
changeset
|
115 [experimental] |
493470e7a0f2
test: update output to match the parent changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4647
diff
changeset
|
116 topic.allow-publish = no |
4647
228caeb8b7af
topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4381
diff
changeset
|
117 |
5139
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
118 Server side visibility |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
119 ====================== |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
120 |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
121 Serving changesets with topics to clients without topic extension can get |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
122 confusing. Such clients will have multiple anonymous heads without a clear way |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
123 to distinguish them. They will also "lose" the canonical heads of the branch. |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
124 |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
125 To avoid this confusion, server can be configured to only serve changesets |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
126 with topics to clients with the topic extension (version 9.3+). This might |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
127 become the default in future: |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
128 |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
129 [experimental] |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
130 topic.server-gate-topic-changesets = yes |
19b8ffd23795
topic: option to hide topic changesets to plain client
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4921
diff
changeset
|
131 |
5601
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
132 Explicitly merging in the target branch |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
133 ======================================= |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
134 |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
135 By default, Mercurial will not let your merge a topic into its target branch |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
136 if that topic is already based on the head of that branch. In other word, |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
137 Mercurial will not let your create a merge that will eventually have two |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
138 parents in the same branches, one parent being the ancestors of the other |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
139 parent. This behavior can be lifted using the following config: |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
140 |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
141 [experimental] |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
142 topic.linear-merge = allow-from-bare-branch |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
143 |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
144 When this option is set to 'allow-from-bare-branch', it is possible to merge a |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
145 topic branch from a bare branch (commit an active topic (eg: public one)) |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
146 regardless of the topology. The result would typically looks like that: |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
147 |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
148 @ summary: resulting merge commit |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
149 |\ branch: my-branch |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
150 | | |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
151 | o summary: some more change in a topic, the merge "target" |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
152 | | branch: my-branch |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
153 | | topic: my-topic |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
154 | | |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
155 | o summary: some change in a topic |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
156 |/ branch: my-branch |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
157 | topic: my-topic |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
158 | |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
159 o summary: previous head of the branch, the merge "source" |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
160 | branch: my-branch |
3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5541
diff
changeset
|
161 |
3763
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
162 list of commands: |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
163 |
4894
f9743b13de6d
help: categorizing evolve and topic commands
Rodrigo Damazio <rdamazio@google.com>
parents:
4704
diff
changeset
|
164 Change organization: |
f9743b13de6d
help: categorizing evolve and topic commands
Rodrigo Damazio <rdamazio@google.com>
parents:
4704
diff
changeset
|
165 |
3763
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
166 topics View current topic, set current topic, change topic for a set |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
167 of revisions, or see all topics. |
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
168 |
4894
f9743b13de6d
help: categorizing evolve and topic commands
Rodrigo Damazio <rdamazio@google.com>
parents:
4704
diff
changeset
|
169 Change navigation: |
f9743b13de6d
help: categorizing evolve and topic commands
Rodrigo Damazio <rdamazio@google.com>
parents:
4704
diff
changeset
|
170 |
f9743b13de6d
help: categorizing evolve and topic commands
Rodrigo Damazio <rdamazio@google.com>
parents:
4704
diff
changeset
|
171 stack list all changesets in a topic and other information |
f9743b13de6d
help: categorizing evolve and topic commands
Rodrigo Damazio <rdamazio@google.com>
parents:
4704
diff
changeset
|
172 |
3763
6f56ff701746
tests: add a test for "hg help -e topic"
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3667
diff
changeset
|
173 (use 'hg help -v topic' to show built-in aliases and global options) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
174 $ hg help topics |
4914
fcefc052a3b1
topic: add more options to command synopsis string
Anton Shestakov <av6@dwimlabs.net>
parents:
4704
diff
changeset
|
175 hg topics [OPTION]... [-r REV]... [TOPIC] |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
176 |
2717
ed45a5fb4452
topics: update the help for `hg topics` describing ways to use the command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
177 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
|
178 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
|
179 |
ed45a5fb4452
topics: update the help for `hg topics` describing ways to use the command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
180 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
|
181 |
2994
1e8ac0fcd6b7
topics: spell out topics completely in help
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2993
diff
changeset
|
182 hg topics --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
|
183 |
ed45a5fb4452
topics: update the help for `hg topics` describing ways to use the command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
184 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
|
185 |
2994
1e8ac0fcd6b7
topics: spell out topics completely in help
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2993
diff
changeset
|
186 hg topics <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
|
187 |
ed45a5fb4452
topics: update the help for `hg topics` describing ways to use the command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
188 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
|
189 |
2994
1e8ac0fcd6b7
topics: spell out topics completely in help
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2993
diff
changeset
|
190 hg topics --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
|
191 |
ed45a5fb4452
topics: update the help for `hg topics` describing ways to use the command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
192 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
|
193 |
2994
1e8ac0fcd6b7
topics: spell out topics completely in help
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2993
diff
changeset
|
194 hg topics <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
|
195 |
ed45a5fb4452
topics: update the help for `hg topics` describing ways to use the command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
196 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
|
197 |
8c2d3c474fc6
doc: make paragraphs before example code end with "::" for reST syntax
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2898
diff
changeset
|
198 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
|
199 |
2993
725b660d9886
topics: show the user who last touched the topic in --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2988
diff
changeset
|
200 List of topics sorted according to their last touched time displaying last |
725b660d9886
topics: show the user who last touched the topic in --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2988
diff
changeset
|
201 touched time and the user who last touched the 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
|
202 |
2994
1e8ac0fcd6b7
topics: spell out topics completely in help
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2993
diff
changeset
|
203 hg topics --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
|
204 |
2717
ed45a5fb4452
topics: update the help for `hg topics` describing ways to use the command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
205 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
|
206 |
2869
b629874ccaac
topics: allow use a --current when setting a topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2868
diff
changeset
|
207 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
|
208 if you want to set the topic on all the draft changesets to the active |
2994
1e8ac0fcd6b7
topics: spell out topics completely in help
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2993
diff
changeset
|
209 topic, you can do: 'hg topics -r "draft()" --current' |
2869
b629874ccaac
topics: allow use a --current when setting a topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2868
diff
changeset
|
210 |
2011
9c7665e3107b
documentation: some basic update of the documentation
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1953
diff
changeset
|
211 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
|
212 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
|
213 |
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
|
214 options ([+] can be repeated): |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
215 |
4200
3a90986622f7
test-compat: backed out changeset ba1e83c841f2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4197
diff
changeset
|
216 --clear clear active topic if any |
3a90986622f7
test-compat: backed out changeset ba1e83c841f2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4197
diff
changeset
|
217 -r --rev REV [+] revset of existing revisions |
3a90986622f7
test-compat: backed out changeset ba1e83c841f2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4197
diff
changeset
|
218 -l --list show the stack of changeset in the topic |
3a90986622f7
test-compat: backed out changeset ba1e83c841f2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4197
diff
changeset
|
219 --age show when you last touched the topics |
3a90986622f7
test-compat: backed out changeset ba1e83c841f2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4197
diff
changeset
|
220 --current display the current topic only |
3a90986622f7
test-compat: backed out changeset ba1e83c841f2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4197
diff
changeset
|
221 -T --template TEMPLATE display with template |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
222 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
223 (some details hidden, use --verbose to show complete help) |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
224 $ hg topics |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
225 |
1851
67d53e8e0c1a
topic: only require obsolete support for --change
Matt Mackall <mpm@selenic.com>
parents:
1849
diff
changeset
|
226 Test topics interaction with evolution: |
67d53e8e0c1a
topic: only require obsolete support for --change
Matt Mackall <mpm@selenic.com>
parents:
1849
diff
changeset
|
227 |
5533
044ce00dfa88
tests: use the modern config setting to enable evolution in topic tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
5507
diff
changeset
|
228 $ hg topics --config experimental.evolution= \ |
044ce00dfa88
tests: use the modern config setting to enable evolution in topic tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
5507
diff
changeset
|
229 > --config experimental.evolution.createmarkers=0 \ |
044ce00dfa88
tests: use the modern config setting to enable evolution in topic tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
5507
diff
changeset
|
230 > --config experimental.evolution.exchange=0 |
044ce00dfa88
tests: use the modern config setting to enable evolution in topic tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
5507
diff
changeset
|
231 $ hg topics --config experimental.evolution= \ |
044ce00dfa88
tests: use the modern config setting to enable evolution in topic tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
5507
diff
changeset
|
232 > --config experimental.evolution.createmarkers=0 \ |
044ce00dfa88
tests: use the modern config setting to enable evolution in topic tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
5507
diff
changeset
|
233 > --config experimental.evolution.exchange=0 \ |
044ce00dfa88
tests: use the modern config setting to enable evolution in topic tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
5507
diff
changeset
|
234 > --rev . bob |
2643
a9ca94defc29
topics: rename '--change' flag to '--rev' flag
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2624
diff
changeset
|
235 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
|
236 [255] |
67d53e8e0c1a
topic: only require obsolete support for --change
Matt Mackall <mpm@selenic.com>
parents:
1849
diff
changeset
|
237 |
67d53e8e0c1a
topic: only require obsolete support for --change
Matt Mackall <mpm@selenic.com>
parents:
1849
diff
changeset
|
238 Create some changes: |
67d53e8e0c1a
topic: only require obsolete support for --change
Matt Mackall <mpm@selenic.com>
parents:
1849
diff
changeset
|
239 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
240 $ for x in alpha beta gamma delta ; do |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
241 > echo file $x >> $x |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
242 > hg addremove |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
243 > hg ci -m "Add file $x" |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
244 > done |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
245 adding alpha |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
246 adding beta |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
247 adding gamma |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
248 adding delta |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
249 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
250 Still no topics |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
251 $ hg topics |
2867
5c0b6af37b21
topics: add a current flag to display current topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2860
diff
changeset
|
252 $ hg topics --current |
5c0b6af37b21
topics: add a current flag to display current topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2860
diff
changeset
|
253 no active topic |
5c0b6af37b21
topics: add a current flag to display current topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2860
diff
changeset
|
254 [1] |
5c0b6af37b21
topics: add a current flag to display current topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2860
diff
changeset
|
255 $ hg topics --current somerandomtopic |
5c0b6af37b21
topics: add a current flag to display current topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2860
diff
changeset
|
256 abort: cannot use --current when setting a topic |
6318
3e488afe62f5
topic: use compat.InputError for conflicting CLI flags
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
257 [10] |
2867
5c0b6af37b21
topics: add a current flag to display current topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2860
diff
changeset
|
258 $ hg topics --current --clear |
5c0b6af37b21
topics: add a current flag to display current topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2860
diff
changeset
|
259 abort: cannot use --current and --clear |
6318
3e488afe62f5
topic: use compat.InputError for conflicting CLI flags
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
260 [10] |
2868
e46b68547017
topic: make --clear + topicname invalid
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2867
diff
changeset
|
261 $ hg topics --clear somerandomtopic |
e46b68547017
topic: make --clear + topicname invalid
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2867
diff
changeset
|
262 abort: cannot use --clear when setting a topic |
6318
3e488afe62f5
topic: use compat.InputError for conflicting CLI flags
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
263 [10] |
6320
0c780d972350
topic: use check_incompatible_arguments() for --list with --clear or --rev
Anton Shestakov <av6@dwimlabs.net>
parents:
6319
diff
changeset
|
264 $ hg topics --list --clear |
0c780d972350
topic: use check_incompatible_arguments() for --list with --clear or --rev
Anton Shestakov <av6@dwimlabs.net>
parents:
6319
diff
changeset
|
265 abort: cannot specify both --list and --clear |
0c780d972350
topic: use check_incompatible_arguments() for --list with --clear or --rev
Anton Shestakov <av6@dwimlabs.net>
parents:
6319
diff
changeset
|
266 [10] |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
267 |
2888
aa5268900ba1
topic: add test showing no restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2869
diff
changeset
|
268 Trying some invalid topicnames |
aa5268900ba1
topic: add test showing no restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2869
diff
changeset
|
269 |
aa5268900ba1
topic: add test showing no restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2869
diff
changeset
|
270 $ hg topic '.' |
2889
31cbace4c0f1
topics: make sure we have some restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2888
diff
changeset
|
271 abort: the name '.' is reserved |
5714
b3d9e6c805d6
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5709
diff
changeset
|
272 [10] |
2888
aa5268900ba1
topic: add test showing no restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2869
diff
changeset
|
273 $ hg topic null |
2889
31cbace4c0f1
topics: make sure we have some restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2888
diff
changeset
|
274 abort: the name 'null' is reserved |
5714
b3d9e6c805d6
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5709
diff
changeset
|
275 [10] |
2888
aa5268900ba1
topic: add test showing no restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2869
diff
changeset
|
276 $ hg topic tip |
2889
31cbace4c0f1
topics: make sure we have some restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2888
diff
changeset
|
277 abort: the name 'tip' is reserved |
5714
b3d9e6c805d6
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5709
diff
changeset
|
278 [10] |
2888
aa5268900ba1
topic: add test showing no restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2869
diff
changeset
|
279 $ hg topic 12345 |
2889
31cbace4c0f1
topics: make sure we have some restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2888
diff
changeset
|
280 abort: cannot use an integer as a name |
5714
b3d9e6c805d6
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5709
diff
changeset
|
281 [10] |
2888
aa5268900ba1
topic: add test showing no restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2869
diff
changeset
|
282 $ hg topic ' ' |
6205
9d81041f735f
topic: make topic name warning similar to branch/tag/bookmark warnings
Anton Shestakov <av6@dwimlabs.net>
parents:
6098
diff
changeset
|
283 abort: topic names cannot consist entirely of whitespace |
6319
8c664ed9c103
topic: use compat.InputError for invalid topic names
Anton Shestakov <av6@dwimlabs.net>
parents:
6318
diff
changeset
|
284 [10] |
2888
aa5268900ba1
topic: add test showing no restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2869
diff
changeset
|
285 |
3652
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
286 $ hg topic 'a12#45' |
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
287 abort: invalid topic name: 'a12#45' |
6611
1dc008b6ad21
topic: add a missing comma in the topic name rejection message
Anton Shestakov <av6@dwimlabs.net>
parents:
6610
diff
changeset
|
288 (topic names can only consist of alphanumeric, '-', '_' and '.' characters) |
6319
8c664ed9c103
topic: use compat.InputError for invalid topic names
Anton Shestakov <av6@dwimlabs.net>
parents:
6318
diff
changeset
|
289 [10] |
3652
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
290 |
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
291 $ hg topic 'foo bar' |
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
292 abort: invalid topic name: 'foo bar' |
6611
1dc008b6ad21
topic: add a missing comma in the topic name rejection message
Anton Shestakov <av6@dwimlabs.net>
parents:
6610
diff
changeset
|
293 (topic names can only consist of alphanumeric, '-', '_' and '.' characters) |
6319
8c664ed9c103
topic: use compat.InputError for invalid topic names
Anton Shestakov <av6@dwimlabs.net>
parents:
6318
diff
changeset
|
294 [10] |
3652
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
295 |
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
296 this is trying to list topic names |
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
297 $ hg topic '' |
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
298 |
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
299 $ hg topic '*12 B23' |
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
300 abort: invalid topic name: '*12 B23' |
6611
1dc008b6ad21
topic: add a missing comma in the topic name rejection message
Anton Shestakov <av6@dwimlabs.net>
parents:
6610
diff
changeset
|
301 (topic names can only consist of alphanumeric, '-', '_' and '.' characters) |
6319
8c664ed9c103
topic: use compat.InputError for invalid topic names
Anton Shestakov <av6@dwimlabs.net>
parents:
6318
diff
changeset
|
302 [10] |
3652
81985b9d3e74
topic-ext: restrict the format of topic names
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3430
diff
changeset
|
303 |
1852
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
304 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
|
305 |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
306 $ echo stuff >> alpha |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
307 $ 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
|
308 |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
309 |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
310 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
|
311 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
|
312 HG: -- |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
313 HG: user: test |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
314 HG: topic 'topicflag' |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
315 HG: branch 'default' |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
316 HG: changed alpha |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
317 abort: empty commit message |
5714
b3d9e6c805d6
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5709
diff
changeset
|
318 [10] |
1852
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
319 $ hg revert alpha |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
320 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
321 * topicflag (0 changesets) |
1852
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
322 |
6206
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
323 Non-ascii topic name |
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
324 |
6610
ae7c75c43f92
topic: properly decode topic and topic namespace after reading from disk
Anton Shestakov <av6@dwimlabs.net>
parents:
6533
diff
changeset
|
325 $ hg topic --clear |
ae7c75c43f92
topic: properly decode topic and topic namespace after reading from disk
Anton Shestakov <av6@dwimlabs.net>
parents:
6533
diff
changeset
|
326 clearing empty topic "topicflag" |
6206
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
327 $ hg --encoding utf-8 topic æ |
6610
ae7c75c43f92
topic: properly decode topic and topic namespace after reading from disk
Anton Shestakov <av6@dwimlabs.net>
parents:
6533
diff
changeset
|
328 marked working directory as topic: \xc3\xa6 (esc) |
ae7c75c43f92
topic: properly decode topic and topic namespace after reading from disk
Anton Shestakov <av6@dwimlabs.net>
parents:
6533
diff
changeset
|
329 $ hg --encoding utf-8 topics |
ae7c75c43f92
topic: properly decode topic and topic namespace after reading from disk
Anton Shestakov <av6@dwimlabs.net>
parents:
6533
diff
changeset
|
330 * æ (0 changesets) (esc) |
ae7c75c43f92
topic: properly decode topic and topic namespace after reading from disk
Anton Shestakov <av6@dwimlabs.net>
parents:
6533
diff
changeset
|
331 $ hg --encoding ascii topics |
ae7c75c43f92
topic: properly decode topic and topic namespace after reading from disk
Anton Shestakov <av6@dwimlabs.net>
parents:
6533
diff
changeset
|
332 * ? (0 changesets) (esc) |
6206
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
333 $ hg --encoding latin1 topics |
6610
ae7c75c43f92
topic: properly decode topic and topic namespace after reading from disk
Anton Shestakov <av6@dwimlabs.net>
parents:
6533
diff
changeset
|
334 * \xe6 (0 changesets) (esc) |
6206
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
335 |
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
336 $ hg --encoding utf-8 topic © |
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
337 abort: invalid topic name: '\xc2\xa9' (esc) |
6611
1dc008b6ad21
topic: add a missing comma in the topic name rejection message
Anton Shestakov <av6@dwimlabs.net>
parents:
6610
diff
changeset
|
338 (topic names can only consist of alphanumeric, '-', '_' and '.' characters) |
6319
8c664ed9c103
topic: use compat.InputError for invalid topic names
Anton Shestakov <av6@dwimlabs.net>
parents:
6318
diff
changeset
|
339 [10] |
6206
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
340 |
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
341 $ hg --encoding latin1 topic æ |
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
342 abort: invalid topic name: '\xc3\xa6' (esc) |
6611
1dc008b6ad21
topic: add a missing comma in the topic name rejection message
Anton Shestakov <av6@dwimlabs.net>
parents:
6610
diff
changeset
|
343 (topic names can only consist of alphanumeric, '-', '_' and '.' characters) |
6319
8c664ed9c103
topic: use compat.InputError for invalid topic names
Anton Shestakov <av6@dwimlabs.net>
parents:
6318
diff
changeset
|
344 [10] |
6206
2ec9c87e8574
topic: allow unicode symbols in names as long as they are alphanumeric
Anton Shestakov <av6@dwimlabs.net>
parents:
6205
diff
changeset
|
345 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
346 Make a topic |
2935
6f7f8c6fcfb0
topics: add tests for cases when a topic is empty
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2929
diff
changeset
|
347 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
348 $ hg topic narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
349 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
350 * narf (0 changesets) |
2935
6f7f8c6fcfb0
topics: add tests for cases when a topic is empty
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2929
diff
changeset
|
351 $ hg topics -v |
2936
3a9303b7b648
topics: show working directory branch when topic is empty
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2935
diff
changeset
|
352 * narf (on branch: default, 0 changesets) |
2935
6f7f8c6fcfb0
topics: add tests for cases when a topic is empty
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2929
diff
changeset
|
353 $ hg stack |
6f7f8c6fcfb0
topics: add tests for cases when a topic is empty
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2929
diff
changeset
|
354 ### topic: narf |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2995
diff
changeset
|
355 ### target: default (branch) |
2937
b54abc7e80e2
topics: improve the description if topic is not touched
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2936
diff
changeset
|
356 (stack is empty) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
357 s0^ Add file delta (base current) |
2935
6f7f8c6fcfb0
topics: add tests for cases when a topic is empty
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2929
diff
changeset
|
358 |
6f7f8c6fcfb0
topics: add tests for cases when a topic is empty
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2929
diff
changeset
|
359 Add commits to topic |
6f7f8c6fcfb0
topics: add tests for cases when a topic is empty
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2929
diff
changeset
|
360 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
361 $ echo topic work >> alpha |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
362 $ hg ci -m 'start on narf' |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
363 active topic 'narf' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3765
diff
changeset
|
364 (see 'hg help topics' for more information) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
365 $ hg co .^ |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
366 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
|
367 $ hg topic fran |
2985
f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas
parents:
2984
diff
changeset
|
368 marked working directory as topic: fran |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
369 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
370 * fran (0 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
371 narf (1 changesets) |
2867
5c0b6af37b21
topics: add a current flag to display current topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2860
diff
changeset
|
372 $ hg topics --current |
5c0b6af37b21
topics: add a current flag to display current topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2860
diff
changeset
|
373 fran |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
374 $ echo >> fran work >> beta |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
375 $ hg ci -m 'start on fran' |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
376 active topic 'fran' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3765
diff
changeset
|
377 (see 'hg help topics' for more information) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
378 $ hg co narf |
1853
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
379 switching to topic narf |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
380 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
|
381 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
382 fran (1 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
383 * narf (1 changesets) |
1869
995617c7f2fc
template: test that topic is accessible through template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1868
diff
changeset
|
384 $ 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
|
385 narf |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
386 $ echo 'narf!!!' >> alpha |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
387 $ hg ci -m 'narf!' |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
388 $ hg log -G |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
389 @ changeset: 6:7c34953036d6 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
390 | tag: tip |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
391 | topic: narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
392 | parent: 4:fb147b0b417c |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
393 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
394 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
395 | summary: narf! |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
396 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
397 | o changeset: 5:0469d521db49 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
398 | | topic: fran |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
399 | | parent: 3:a53952faf762 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
400 | | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
401 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
402 | | summary: start on fran |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
403 | | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
404 o | changeset: 4:fb147b0b417c |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
405 |/ topic: narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
406 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
407 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
408 | summary: start on narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
409 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
410 o changeset: 3:a53952faf762 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
411 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
412 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
413 | summary: Add file delta |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
414 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
415 o changeset: 2:15d1eb11d2fa |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
416 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
417 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
418 | summary: Add file gamma |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
419 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
420 o changeset: 1:c692ea2c9224 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
421 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
422 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
423 | summary: Add file beta |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
424 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
425 o changeset: 0:c2b7d2f7d14b |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
426 user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
427 date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
428 summary: Add file alpha |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
429 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
430 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
431 Exchanging of topics: |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
432 $ cd .. |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
433 $ hg init brain |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
434 $ hg -R pinky push -r 4 brain |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
435 pushing to brain |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
436 searching for changes |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
437 adding changesets |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
438 adding manifests |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
439 adding file changes |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
440 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
|
441 |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
442 Export |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
443 |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
444 $ hg -R pinky export |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
445 # HG changeset patch |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
446 # User test |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
447 # Date 0 0 |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
448 # 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
|
449 # Node ID 7c34953036d6a36eae468c550d0592b89ee8bffc |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
450 # Parent fb147b0b417c25ca15547cd945acf51cf8dcaf02 |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
451 # EXP-Topic narf |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
452 narf! |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
453 |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
454 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
|
455 --- 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
|
456 +++ 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
|
457 @@ -1,2 +1,3 @@ |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
458 file alpha |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
459 topic work |
13fc93fb7fbe
patch: add topic to exported patch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1864
diff
changeset
|
460 +narf!!! |
1867
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
461 |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
462 Import |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
463 |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
464 $ 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
|
465 $ 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
|
466 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
|
467 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
|
468 $ 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
|
469 applying narf.diff |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
470 $ hg -R pinky log -r . |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
471 changeset: 6:7c34953036d6 |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
472 tag: tip |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
473 topic: narf |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
474 parent: 4:fb147b0b417c |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
475 user: test |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
476 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
|
477 summary: narf! |
c9cacc62fa17
patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1866
diff
changeset
|
478 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
479 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
|
480 draft, so we won't see that topic name anymore: |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
481 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
482 $ hg log -R pinky -G |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
483 @ changeset: 6:7c34953036d6 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
484 | tag: tip |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
485 | topic: narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
486 | parent: 4:fb147b0b417c |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
487 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
488 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
489 | summary: narf! |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
490 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
491 | o changeset: 5:0469d521db49 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
492 | | topic: fran |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
493 | | parent: 3:a53952faf762 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
494 | | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
495 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
496 | | summary: start on fran |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
497 | | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
498 o | changeset: 4:fb147b0b417c |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
499 |/ user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
500 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
501 | summary: start on narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
502 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
503 o changeset: 3:a53952faf762 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
504 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
505 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
506 | summary: Add file delta |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
507 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
508 o changeset: 2:15d1eb11d2fa |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
509 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
510 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
511 | summary: Add file gamma |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
512 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
513 o changeset: 1:c692ea2c9224 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
514 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
515 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
516 | summary: Add file beta |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
517 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
518 o changeset: 0:c2b7d2f7d14b |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
519 user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
520 date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
521 summary: Add file alpha |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
522 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
523 $ cd brain |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
524 $ hg co tip |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
525 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
|
526 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
527 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
|
528 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
529 $ hg topic |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
530 $ echo what >> alpha |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
531 $ hg topic query |
2985
f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas
parents:
2984
diff
changeset
|
532 marked working directory as topic: query |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
533 $ hg ci -m 'what is narf, pinky?' |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
534 active topic 'query' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3765
diff
changeset
|
535 (see 'hg help topics' for more information) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
536 $ hg log -Gl2 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
537 @ changeset: 5:c01515cfc331 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
538 | tag: tip |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
539 | topic: query |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
540 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
541 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
542 | summary: what is narf, pinky? |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
543 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
544 o changeset: 4:fb147b0b417c |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
545 | user: test |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
546 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
547 summary: start on narf |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
548 |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
549 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
550 $ hg push -f ../pinky -r query |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
551 pushing to ../pinky |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
552 searching for changes |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
553 adding changesets |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
554 adding manifests |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
555 adding file changes |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
556 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
|
557 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
558 $ hg -R ../pinky log -Gl 4 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
559 o changeset: 7:c01515cfc331 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
560 | tag: tip |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
561 | topic: query |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
562 | parent: 4:fb147b0b417c |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
563 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
564 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
565 | summary: what is narf, pinky? |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
566 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
567 | @ changeset: 6:7c34953036d6 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
568 |/ topic: narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
569 | parent: 4:fb147b0b417c |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
570 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
571 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
572 | summary: narf! |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
573 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
574 | o changeset: 5:0469d521db49 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
575 | | topic: fran |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
576 | ~ parent: 3:a53952faf762 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
577 | user: test |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
578 | date: Thu Jan 01 00:00:00 1970 +0000 |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
579 | summary: start on fran |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
580 | |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
581 o changeset: 4:fb147b0b417c |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
582 | user: test |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
583 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
584 summary: start on narf |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
585 |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
586 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
587 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
588 * query (1 changesets) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
589 $ cd ../pinky |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
590 $ hg co query |
1853
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
591 switching to topic query |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
592 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
|
593 $ echo answer >> alpha |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
594 $ hg ci -m 'Narf is like `zort` or `poit`!' |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
595 $ hg merge narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
596 merging alpha |
1868
5cdd5e0a421c
test: adapt to newer mercurial
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1867
diff
changeset
|
597 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
|
598 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
3430
14fbb847be5a
test: update output for new `merge --abort` message
Boris Feld <boris.feld@octobus.net>
parents:
3397
diff
changeset
|
599 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
600 [1] |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
601 $ hg revert -r narf alpha |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
602 $ hg resolve -m alpha |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
603 (no more unresolved files) |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
604 $ hg topic narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
605 $ hg ci -m 'Finish narf' |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
606 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
607 fran (1 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
608 * narf (2 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
609 query (2 changesets) |
6271
caf302fb8f4d
topic: use branch//namespace/topic format everywhere except exchange
Anton Shestakov <av6@dwimlabs.net>
parents:
6206
diff
changeset
|
610 $ hg debugnamecomplete |
1857
a506ed8ab8da
topics: add listnames hook so completion works
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
611 default |
6271
caf302fb8f4d
topic: use branch//namespace/topic format everywhere except exchange
Anton Shestakov <av6@dwimlabs.net>
parents:
6206
diff
changeset
|
612 default//fran |
caf302fb8f4d
topic: use branch//namespace/topic format everywhere except exchange
Anton Shestakov <av6@dwimlabs.net>
parents:
6206
diff
changeset
|
613 default//narf |
caf302fb8f4d
topic: use branch//namespace/topic format everywhere except exchange
Anton Shestakov <av6@dwimlabs.net>
parents:
6206
diff
changeset
|
614 default//query |
1857
a506ed8ab8da
topics: add listnames hook so completion works
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
615 fran |
a506ed8ab8da
topics: add listnames hook so completion works
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
616 narf |
a506ed8ab8da
topics: add listnames hook so completion works
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
617 query |
a506ed8ab8da
topics: add listnames hook so completion works
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
618 tip |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
619 $ hg phase --public narf |
2986
4746b92cc1f8
topics/ui: signal when an operation entails voiding a topic
Aurélien Campéas
parents:
2985
diff
changeset
|
620 active topic 'narf' is now empty |
3770
eb928f5728c4
topic: suggest to clear a topic that becomes empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3769
diff
changeset
|
621 (use 'hg topic --clear' to clear it if needed) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
622 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
623 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
|
624 narf commits public: |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
625 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
626 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
627 fran (1 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
628 * narf (0 changesets) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
629 $ hg log -Gl 6 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
630 @ changeset: 9:ae074045b7a7 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
631 |\ tag: tip |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
632 | | parent: 8:54c943c1c167 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
633 | | parent: 6:7c34953036d6 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
634 | | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
635 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
636 | | summary: Finish narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
637 | | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
638 | o changeset: 8:54c943c1c167 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
639 | | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
640 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
641 | | summary: Narf is like `zort` or `poit`! |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
642 | | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
643 | o changeset: 7:c01515cfc331 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
644 | | parent: 4:fb147b0b417c |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
645 | | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
646 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
647 | | summary: what is narf, pinky? |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
648 | | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
649 o | changeset: 6:7c34953036d6 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
650 |/ parent: 4:fb147b0b417c |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
651 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
652 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
653 | summary: narf! |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
654 | |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
655 | o changeset: 5:0469d521db49 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
656 | | topic: fran |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
657 | ~ parent: 3:a53952faf762 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
658 | user: test |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
659 | date: Thu Jan 01 00:00:00 1970 +0000 |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
660 | summary: start on fran |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
661 | |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
662 o changeset: 4:fb147b0b417c |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
663 | user: test |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
664 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
665 summary: start on narf |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
666 |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
667 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
668 $ cd ../brain |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
669 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
670 * query (1 changesets) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
671 $ hg pull ../pinky -r narf |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
672 pulling from ../pinky |
5709
d0f73113fcc0
tests: remove trailing "!" from abort messages
Anton Shestakov <av6@dwimlabs.net>
parents:
5601
diff
changeset
|
673 abort: unknown revision 'narf' |
6098
442771901e01
tests: update exit codes for dealing with RepoLookupError
Anton Shestakov <av6@dwimlabs.net>
parents:
6053
diff
changeset
|
674 [10] |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
675 $ hg pull ../pinky -r default |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
676 pulling from ../pinky |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
677 searching for changes |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
678 adding changesets |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
679 adding manifests |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
680 adding file changes |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
681 added 3 changesets with 3 changes to 1 files |
3075
8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3060
diff
changeset
|
682 new changesets 7c34953036d6:ae074045b7a7 |
3837
dda5b2134b32
tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3786
diff
changeset
|
683 1 local changesets published |
2986
4746b92cc1f8
topics/ui: signal when an operation entails voiding a topic
Aurélien Campéas
parents:
2985
diff
changeset
|
684 active topic 'query' is now empty |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
685 (run 'hg update' to get a working copy) |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
686 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
687 * query (0 changesets) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
688 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
689 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
|
690 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
691 $ hg pull ../pinky |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
692 pulling from ../pinky |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
693 searching for changes |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
694 adding changesets |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
695 adding manifests |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
696 adding file changes |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
697 added 1 changesets with 1 changes to 1 files (+1 heads) |
4197
1dd5c6e6cd53
test-compat: backed out changeset ccbfbeee6cf3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
698 new changesets 0469d521db49 (1 drafts) |
1885
d49f75eab6a3
topic: take topic in account for all branch head computation
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1874
diff
changeset
|
699 (run 'hg heads' to see heads) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
700 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
701 fran (1 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
702 * query (0 changesets) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
703 $ hg log -Gr 'draft()' |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
704 o changeset: 9:0469d521db49 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
705 | tag: tip |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
706 ~ topic: fran |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
707 parent: 3:a53952faf762 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
708 user: test |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
709 date: Thu Jan 01 00:00:00 1970 +0000 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
710 summary: start on fran |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
711 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
712 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
713 query is not an open topic, so when we clear the current topic it'll |
5798
87006dcf2bb7
doc: change topic phrase 'disappear' to 'fade out'
Chuck Tuffli <chuck@tuffli.net>
parents:
5722
diff
changeset
|
714 fade out: |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
715 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
716 $ hg topics --clear |
2984
30f6030dca8f
topics: signal to the end user when a topic has been forgotten
Aurélien Campéas
parents:
2938
diff
changeset
|
717 clearing empty topic "query" |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
718 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
719 fran (1 changesets) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
720 |
1843
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
721 Topic revset |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
722 $ hg log -r 'topic()' -G |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
723 o changeset: 9:0469d521db49 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
724 | tag: tip |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
725 ~ topic: fran |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
726 parent: 3:a53952faf762 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
727 user: test |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
728 date: Thu Jan 01 00:00:00 1970 +0000 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
729 summary: start on fran |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
730 |
1843
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
731 $ hg log -r 'not topic()' -G |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
732 o changeset: 8:ae074045b7a7 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
733 |\ parent: 7:54c943c1c167 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
734 | | parent: 6:7c34953036d6 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
735 | | user: test |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
736 | | 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
|
737 | | summary: Finish narf |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
738 | | |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
739 | o changeset: 7:54c943c1c167 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
740 | | parent: 5:c01515cfc331 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
741 | | user: test |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
742 | | 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
|
743 | | 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
|
744 | | |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
745 o | changeset: 6:7c34953036d6 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
746 | | parent: 4:fb147b0b417c |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
747 | | user: test |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
748 | | 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
|
749 | | summary: narf! |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
750 | | |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
751 | @ changeset: 5:c01515cfc331 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
752 |/ user: test |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
753 | 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
|
754 | summary: what is narf, pinky? |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
755 | |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
756 o changeset: 4:fb147b0b417c |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
757 | user: test |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
758 | 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
|
759 | summary: start on narf |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
760 | |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
761 o changeset: 3:a53952faf762 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
762 | user: test |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
763 | 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
|
764 | summary: Add file delta |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
765 | |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
766 o changeset: 2:15d1eb11d2fa |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
767 | user: test |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
768 | 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
|
769 | summary: Add file gamma |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
770 | |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
771 o changeset: 1:c692ea2c9224 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
772 | user: test |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
773 | 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
|
774 | summary: Add file beta |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
775 | |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
776 o changeset: 0:c2b7d2f7d14b |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
777 user: test |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
778 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
|
779 summary: Add file alpha |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
780 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
781 No matches because narf is already closed: |
4062
6774820c8a2e
test: search for empty topic as a string
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4061
diff
changeset
|
782 $ hg log -r 'topic("narf")' -G |
1843
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
783 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
|
784 $ 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
|
785 o changeset: 9:0469d521db49 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
786 | tag: tip |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
787 ~ topic: fran |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
788 parent: 3:a53952faf762 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
789 user: test |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
790 date: Thu Jan 01 00:00:00 1970 +0000 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
791 summary: start on fran |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
792 |
1843
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
793 Exact match on fran: |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
794 $ hg log -r 'topic(fran)' -G |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
795 o changeset: 9:0469d521db49 |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
796 | tag: tip |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
797 ~ topic: fran |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
798 parent: 3:a53952faf762 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
799 user: test |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
800 date: Thu Jan 01 00:00:00 1970 +0000 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
801 summary: start on fran |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
802 |
1843
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1839
diff
changeset
|
803 |
1864
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
804 Match current topic: |
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
805 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
806 fran (1 changesets) |
1864
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
807 $ hg log -r 'topic(.)' |
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
808 (no output is expected) |
5507
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
809 |
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
810 $ hg up 8 |
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
811 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
812 $ echo test > gamma |
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
813 $ hg ci -m non-topic |
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
814 $ hg log -r 'topic(.)' |
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
815 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
816 $ hg co fran |
1853
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
817 switching to topic fran |
5507
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
818 3 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
|
819 $ hg log -r 'topic(.)' |
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
820 changeset: 9:0469d521db49 |
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
821 topic: fran |
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
822 parent: 3:a53952faf762 |
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
823 user: test |
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
824 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
|
825 summary: start on fran |
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
826 |
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
827 |
4060
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
828 Using revsets in topic() |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
829 $ tlog() { |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
830 > hg log -T '{rev}: {topic}\n' -r "$1" |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
831 > } |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
832 |
4061
ad4194399b47
topic: handle ambiguous arguments to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
4060
diff
changeset
|
833 $ tlog 'topic(9)' |
ad4194399b47
topic: handle ambiguous arguments to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
4060
diff
changeset
|
834 9: fran |
ad4194399b47
topic: handle ambiguous arguments to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
4060
diff
changeset
|
835 $ tlog 'topic(8)' |
4060
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
836 $ tlog 'topic(head())' |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
837 9: fran |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
838 $ tlog 'topic(:)' |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
839 9: fran |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
840 $ tlog 'topic(all())' |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
841 9: fran |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
842 $ tlog 'topic(topic(fran))' |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
843 9: fran |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
844 $ tlog 'topic(wdir())' |
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
845 9: fran |
4061
ad4194399b47
topic: handle ambiguous arguments to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
4060
diff
changeset
|
846 $ tlog 'topic(nonsense)' |
5709
d0f73113fcc0
tests: remove trailing "!" from abort messages
Anton Shestakov <av6@dwimlabs.net>
parents:
5601
diff
changeset
|
847 abort: unknown revision 'nonsense' |
6053
be2008649675
branching: preserve test changes on stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6052
diff
changeset
|
848 [10] |
4061
ad4194399b47
topic: handle ambiguous arguments to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
4060
diff
changeset
|
849 |
ad4194399b47
topic: handle ambiguous arguments to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
4060
diff
changeset
|
850 Pattern matching in topic() revset |
ad4194399b47
topic: handle ambiguous arguments to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
4060
diff
changeset
|
851 $ tlog 'topic("re:nonsense")' |
ad4194399b47
topic: handle ambiguous arguments to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
4060
diff
changeset
|
852 $ tlog 'topic("literal:nonsense")' |
5709
d0f73113fcc0
tests: remove trailing "!" from abort messages
Anton Shestakov <av6@dwimlabs.net>
parents:
5601
diff
changeset
|
853 abort: topic 'nonsense' does not exist |
6053
be2008649675
branching: preserve test changes on stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6052
diff
changeset
|
854 [10] |
4060
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
855 |
6533
3d16c9a8cf3a
topic: update topic namespace revset to use "none" as the default/empty value
Anton Shestakov <av6@dwimlabs.net>
parents:
6320
diff
changeset
|
856 Sanity checks for topicnamespace() revset |
3d16c9a8cf3a
topic: update topic namespace revset to use "none" as the default/empty value
Anton Shestakov <av6@dwimlabs.net>
parents:
6320
diff
changeset
|
857 |
3d16c9a8cf3a
topic: update topic namespace revset to use "none" as the default/empty value
Anton Shestakov <av6@dwimlabs.net>
parents:
6320
diff
changeset
|
858 $ tlog 'topicnamespace()' |
3d16c9a8cf3a
topic: update topic namespace revset to use "none" as the default/empty value
Anton Shestakov <av6@dwimlabs.net>
parents:
6320
diff
changeset
|
859 |
1864
70d1191fceed
topic: allow use of topic(.) to match the p1 topic
Augie Fackler <raf@durin42.com>
parents:
1862
diff
changeset
|
860 Deactivate the topic. |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
861 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
862 * fran (1 changesets) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
863 $ hg topics --clear |
4060
54eade86ac31
topic: handle revsets passed to topic() revset
Anton Shestakov <av6@dwimlabs.net>
parents:
3837
diff
changeset
|
864 $ hg log -r 'topic(wdir())' |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
865 $ echo fran? >> beta |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
866 $ 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
|
867 created new head |
3397
f7129e3d5a38
topic: suggest using topic when user creates a new head on branch
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3225
diff
changeset
|
868 (consider using topic for lightweight branches. See 'hg help topic') |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
869 $ hg log -Gr 'draft()' |
5507
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
870 @ changeset: 11:4073470c35e1 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
871 | tag: tip |
5507
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
872 | parent: 9:0469d521db49 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
873 | user: test |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
874 | date: Thu Jan 01 00:00:00 1970 +0000 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
875 | summary: fran? |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
876 | |
5507
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
877 | o changeset: 10:de75ec1bdbe8 |
95478db35f88
topic: fix the `topic(...)` revset to not select commits without a topic
Matt Harbison <matt_harbison@yahoo.com>
parents:
5139
diff
changeset
|
878 | | parent: 8:ae074045b7a7 |
5969
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
879 | ~ user: test |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
880 | date: Thu Jan 01 00:00:00 1970 +0000 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
881 | summary: non-topic |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
882 | |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
883 o changeset: 9:0469d521db49 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
884 | topic: fran |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
885 ~ parent: 3:a53952faf762 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
886 user: test |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
887 date: Thu Jan 01 00:00:00 1970 +0000 |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
888 summary: start on fran |
f8ab6ad1ffc0
tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents:
5798
diff
changeset
|
889 |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
890 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
891 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
892 fran (1 changesets) |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2691
diff
changeset
|
893 |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4062
diff
changeset
|
894 Testing for updating to s0 |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2691
diff
changeset
|
895 ========================== |
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2691
diff
changeset
|
896 |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
897 $ hg up fran |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
898 switching to topic fran |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
899 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2691
diff
changeset
|
900 $ hg stack |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
901 ### topic: fran |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3085
diff
changeset
|
902 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
903 s1@ start on fran (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
904 s0^ 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
|
905 |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4062
diff
changeset
|
906 $ hg up s0 |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
907 preserving the current topic 'fran' |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
908 1 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
|
909 |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2691
diff
changeset
|
910 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
911 * fran (1 changesets) |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2691
diff
changeset
|
912 $ hg stack |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
913 ### topic: fran |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3085
diff
changeset
|
914 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
915 s1: start on fran |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
916 s0^ Add file delta (base current) |
2718
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
917 |
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
|
918 $ hg topics --age |
4303
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
919 * fran (1970-01-01 by test, 1 changesets) |
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
|
920 |
2718
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
921 $ cd .. |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
922 |
4339
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
923 Relation subscript in revsets |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
924 ============================= |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
925 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
926 $ hg init more-than-one-commit-per-topic |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
927 $ cd more-than-one-commit-per-topic |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
928 $ cat > .hg/hgrc << EOF |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
929 > [phases] |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
930 > publish=false |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
931 > EOF |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
932 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
933 $ echo 0 > foo |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
934 $ hg ci -qAm 0 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
935 $ hg topic featureA |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
936 marked working directory as topic: featureA |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
937 $ echo 1 > foo |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
938 $ hg ci -qm 1 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
939 $ echo 2 > foo |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
940 $ hg ci -qm 2 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
941 $ echo 3 > foo |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
942 $ hg ci -qm 3 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
943 $ hg topic --clear |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
944 $ echo 4 > foo |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
945 $ hg ci -qm 4 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
946 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
947 $ tlog 'all()' |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
948 0: |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
949 1: featureA |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
950 2: featureA |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
951 3: featureA |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
952 4: |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
953 |
4339
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
954 topic subscript relation |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
955 |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
956 $ tlog 'featureA' |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
957 3: featureA |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
958 $ tlog 'featureA#topic[0]' |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
959 3: featureA |
4379
2893b127923b
topic: make ranges work in revset relations like 'foo#topic[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4339
diff
changeset
|
960 $ tlog 'featureA#topic[:]' |
2893b127923b
topic: make ranges work in revset relations like 'foo#topic[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4339
diff
changeset
|
961 1: featureA |
2893b127923b
topic: make ranges work in revset relations like 'foo#topic[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4339
diff
changeset
|
962 2: featureA |
2893b127923b
topic: make ranges work in revset relations like 'foo#topic[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4339
diff
changeset
|
963 3: featureA |
4339
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
964 |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
965 $ tlog '2#t[-2]' |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
966 $ tlog '2#t[-1]' |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
967 1: featureA |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
968 $ tlog '2#t[0]' |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
969 2: featureA |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
970 $ tlog '2#t[1]' |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
971 3: featureA |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
972 $ tlog '2#t[2]' |
4379
2893b127923b
topic: make ranges work in revset relations like 'foo#topic[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4339
diff
changeset
|
973 $ tlog '2#t[-1:1]' |
2893b127923b
topic: make ranges work in revset relations like 'foo#topic[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4339
diff
changeset
|
974 1: featureA |
2893b127923b
topic: make ranges work in revset relations like 'foo#topic[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4339
diff
changeset
|
975 2: featureA |
2893b127923b
topic: make ranges work in revset relations like 'foo#topic[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4339
diff
changeset
|
976 3: featureA |
4339
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
977 |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
978 stack subscript relation |
0f015fe4f71f
topic: make revsets like 'foo#topic[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4323
diff
changeset
|
979 |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
980 $ hg stack |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
981 ### target: default (branch) |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
982 s2@ 4 (current) |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
983 ^ 3 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
984 s1: 0 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
985 |
5333
028e4ea75456
topic: support foo#stack syntax
Anton Shestakov <av6@dwimlabs.net>
parents:
5139
diff
changeset
|
986 $ tlog 'tip#s' |
028e4ea75456
topic: support foo#stack syntax
Anton Shestakov <av6@dwimlabs.net>
parents:
5139
diff
changeset
|
987 0: |
028e4ea75456
topic: support foo#stack syntax
Anton Shestakov <av6@dwimlabs.net>
parents:
5139
diff
changeset
|
988 4: |
028e4ea75456
topic: support foo#stack syntax
Anton Shestakov <av6@dwimlabs.net>
parents:
5139
diff
changeset
|
989 |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
990 $ tlog 'tip#stack[0]' |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
991 $ tlog 'tip#stack[1]' |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
992 0: |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
993 $ tlog 'tip#stack[2]' |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
994 4: |
4323
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
995 $ tlog 'tip#stack[-1]' |
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
996 4: |
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
997 $ tlog 'tip#stack[-2]' |
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
998 0: |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
999 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1000 $ hg stack featureA |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1001 ### topic: featureA |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1002 ### target: default (branch), 3 behind |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1003 s3: 3 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1004 s2: 2 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1005 s1: 1 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1006 s0^ 0 (base) |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1007 |
5333
028e4ea75456
topic: support foo#stack syntax
Anton Shestakov <av6@dwimlabs.net>
parents:
5139
diff
changeset
|
1008 $ tlog 'featureA#s' |
028e4ea75456
topic: support foo#stack syntax
Anton Shestakov <av6@dwimlabs.net>
parents:
5139
diff
changeset
|
1009 1: featureA |
028e4ea75456
topic: support foo#stack syntax
Anton Shestakov <av6@dwimlabs.net>
parents:
5139
diff
changeset
|
1010 2: featureA |
028e4ea75456
topic: support foo#stack syntax
Anton Shestakov <av6@dwimlabs.net>
parents:
5139
diff
changeset
|
1011 3: featureA |
028e4ea75456
topic: support foo#stack syntax
Anton Shestakov <av6@dwimlabs.net>
parents:
5139
diff
changeset
|
1012 |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1013 $ tlog 'featureA#s[0]' |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1014 0: |
4381
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1015 $ tlog 'featureA#s[0:0]' |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1016 0: |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1017 $ tlog 'featureA#s[:]' |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1018 1: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1019 2: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1020 3: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1021 $ tlog 'featureA#s[2:]' |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1022 2: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1023 3: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1024 $ tlog 'featureA#s[:2]' |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1025 1: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1026 2: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1027 $ tlog 'featureA#s[0:1]' |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1028 0: |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1029 1: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1030 $ tlog 'featureA#s[-1:0]' |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1031 0: |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1032 3: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1033 $ tlog 'featureA#s[-3:3]' |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1034 1: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1035 2: featureA |
5f1d0cff514d
topic: make ranges work in revset relations like 'foo#stack[1:2]'
Anton Shestakov <av6@dwimlabs.net>
parents:
4379
diff
changeset
|
1036 3: featureA |
4323
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
1037 $ tlog 'featureA#s[1] and featureA#s[-3]' |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1038 1: featureA |
4323
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
1039 $ tlog 'featureA#s[2] and featureA#s[-2]' |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1040 2: featureA |
4323
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
1041 $ tlog 'featureA#s[3] and featureA#s[-1]' |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1042 3: featureA |
4323
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
1043 $ tlog 'featureA#s[-4]' |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1044 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1045 $ tlog 'all()#s[-1]' |
4323
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
1046 3: featureA |
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
1047 4: |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1048 $ tlog 'all()#s[0]' |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1049 0: |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1050 $ tlog 'all()#s[1]' |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1051 0: |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1052 1: featureA |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1053 $ tlog 'all()#s[9999]' |
4323
482992803db6
topic: make revsets like foo#stack[-1] work too
Anton Shestakov <av6@dwimlabs.net>
parents:
4322
diff
changeset
|
1054 $ tlog 'all()#s[-9999]' |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1055 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1056 $ hg topic featureB |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1057 marked working directory as topic: featureB |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1058 $ hg stack |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1059 ### topic: featureB |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1060 ### target: default (branch) |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1061 (stack is empty) |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1062 s0^ 4 (base current) |
5333
028e4ea75456
topic: support foo#stack syntax
Anton Shestakov <av6@dwimlabs.net>
parents:
5139
diff
changeset
|
1063 $ tlog 'wdir()#s' |
4322
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1064 $ tlog 'wdir()#s[0]' |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1065 4: |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1066 |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1067 $ cd .. |
41f38bf15b4c
topic: make revsets like 'foo#stack[0]' work
Anton Shestakov <av6@dwimlabs.net>
parents:
4303
diff
changeset
|
1068 |
2718
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1069 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
|
1070 ====================================================== |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1071 |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1072 $ hg init ponky |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1073 $ cd ponky |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1074 $ cat <<EOF >> .hg/hgrc |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1075 > [phases] |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1076 > publish=false |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1077 > EOF |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1078 $ cat <<EOF >> $HGRCPATH |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1079 > [experimental] |
3021
5f4c42d4f2e8
test: update tests to use topic-mode enforce
Boris Feld <boris.feld@octobus.net>
parents:
3013
diff
changeset
|
1080 > topic-mode = enforce |
2718
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1081 > EOF |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1082 $ touch a b c d |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1083 $ hg add a |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1084 $ hg ci -m "Added a" |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1085 abort: no active topic |
3027
b220e2f5ebd5
topic: update the topic-mode hint
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3023
diff
changeset
|
1086 (see 'hg help -e topic.topic-mode' for details) |
2718
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1087 [255] |
2733
adfbb984ebbb
topics: check for topic on commit before a user enters message
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2731
diff
changeset
|
1088 |
adfbb984ebbb
topics: check for topic on commit before a user enters message
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2731
diff
changeset
|
1089 (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
|
1090 |
adfbb984ebbb
topics: check for topic on commit before a user enters message
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2731
diff
changeset
|
1091 $ 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
|
1092 abort: no active topic |
3027
b220e2f5ebd5
topic: update the topic-mode hint
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3023
diff
changeset
|
1093 (see 'hg help -e topic.topic-mode' for details) |
2733
adfbb984ebbb
topics: check for topic on commit before a user enters message
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2731
diff
changeset
|
1094 [255] |
3021
5f4c42d4f2e8
test: update tests to use topic-mode enforce
Boris Feld <boris.feld@octobus.net>
parents:
3013
diff
changeset
|
1095 $ hg ci -m "added a" --config experimental.topic-mode=off |
2718
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1096 $ hg log |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1097 changeset: 0:a154386e50d1 |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1098 tag: tip |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1099 user: test |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1100 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
|
1101 summary: added a |
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1102 |
3023
cc740c545776
topicmode: add new warning topicmode
Boris Feld <boris.feld@octobus.net>
parents:
3021
diff
changeset
|
1103 |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1104 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
|
1105 ====================================== |
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1106 |
2747
9fd6c8efda5b
topics: add a test demonstarting sorting of topics by time using --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2733
diff
changeset
|
1107 $ 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
|
1108 switching to topic topic1970 |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
4208
diff
changeset
|
1109 changed topic on 1 changesets to "topic1970" |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1110 |
2747
9fd6c8efda5b
topics: add a test demonstarting sorting of topics by time using --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2733
diff
changeset
|
1111 $ 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
|
1112 $ hg topic topic1990 |
2993
725b660d9886
topics: show the user who last touched the topic in --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2988
diff
changeset
|
1113 $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo" |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
1114 active topic 'topic1990' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3765
diff
changeset
|
1115 (see 'hg help topics' for more information) |
2747
9fd6c8efda5b
topics: add a test demonstarting sorting of topics by time using --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2733
diff
changeset
|
1116 $ 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
|
1117 $ hg topic topic2010 |
2993
725b660d9886
topics: show the user who last touched the topic in --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2988
diff
changeset
|
1118 $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar" |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
1119 active topic 'topic2010' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3765
diff
changeset
|
1120 (see 'hg help topics' for more information) |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1121 |
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1122 $ hg log -G |
2993
725b660d9886
topics: show the user who last touched the topic in --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2988
diff
changeset
|
1123 @ changeset: 3:76b16af75125 |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1124 | tag: tip |
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1125 | topic: topic2010 |
2993
725b660d9886
topics: show the user who last touched the topic in --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2988
diff
changeset
|
1126 | user: bar |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1127 | 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
|
1128 | 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
|
1129 | |
2993
725b660d9886
topics: show the user who last touched the topic in --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2988
diff
changeset
|
1130 o changeset: 2:bba5bde53608 |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1131 | topic: topic1990 |
2993
725b660d9886
topics: show the user who last touched the topic in --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2988
diff
changeset
|
1132 | user: foo |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1133 | 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
|
1134 | 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
|
1135 | |
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1136 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
|
1137 topic: topic1970 |
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1138 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
|
1139 user: test |
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1140 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
|
1141 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
|
1142 |
9fd6c8efda5b
topics: add a test demonstarting sorting of topics by time using --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2733
diff
changeset
|
1143 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
1144 topic1970 (1 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
1145 topic1990 (1 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
1146 * topic2010 (1 changesets) |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1147 |
2747
9fd6c8efda5b
topics: add a test demonstarting sorting of topics by time using --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2733
diff
changeset
|
1148 $ hg topics --age |
4303
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1149 * topic2010 (2010-01-01 by bar, 1 changesets) |
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1150 topic1990 (1990-01-01 by foo, 1 changesets) |
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1151 topic1970 (1970-01-01 by test, 1 changesets) |
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1152 |
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1153 $ hg topics --age --verbose |
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1154 * topic2010 (2010-01-01 by bar, on branch: default, 1 changesets) |
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1155 topic1990 (1990-01-01 by foo, on branch: default, 1 changesets) |
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1156 topic1970 (1970-01-01 by test, on branch: default, 1 changesets) |
2860
27ae7afd9a2a
tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2834
diff
changeset
|
1157 |
2747
9fd6c8efda5b
topics: add a test demonstarting sorting of topics by time using --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2733
diff
changeset
|
1158 $ 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
|
1159 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
|
1160 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
|
1161 |
2747
9fd6c8efda5b
topics: add a test demonstarting sorting of topics by time using --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2733
diff
changeset
|
1162 $ hg topics --age |
4303
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1163 topic2010 (2010-01-01 by bar, 1 changesets) |
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1164 topic1990 (1990-01-01 by foo, 1 changesets) |
78700a59192a
topic: merge _showlasttouched logic into _listtopics
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
1165 * topic1970 (1970-01-01 by test, 1 changesets) |
2747
9fd6c8efda5b
topics: add a test demonstarting sorting of topics by time using --age
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2733
diff
changeset
|
1166 |
2995
dbc896a7a1c3
topics: make sure user don't pass both the age option and a topic name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2994
diff
changeset
|
1167 $ hg topics --age random |
dbc896a7a1c3
topics: make sure user don't pass both the age option and a topic name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2994
diff
changeset
|
1168 abort: cannot use --age while setting a topic |
6318
3e488afe62f5
topic: use compat.InputError for conflicting CLI flags
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
1169 [10] |
2718
b6fa7b3e13d4
topics: add a config knob to forbid untopiced commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2717
diff
changeset
|
1170 $ cd .. |
4703
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1171 |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1172 Test that topics doesn't confuse branchheads checking logic |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1173 ----------------------------------------------------------- |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1174 |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1175 $ hg init hgtags |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1176 $ cd hgtags |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1177 $ echo a > a |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1178 $ hg ci -Am "added a" --config experimental.topic-mode=default |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1179 adding a |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1180 $ echo b > b |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1181 $ hg ci -Am "added b" --config experimental.topic-mode=default |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1182 adding b |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1183 |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1184 $ hg topic foo -r . |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1185 switching to topic foo |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1186 changed topic on 1 changesets to "foo" |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1187 |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1188 Try to put a tag on current rev which also has an active topic: |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1189 $ hg tag 1.0 |
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1190 $ hg tags |
4704
5f90eb8fd63c
evolve: fix confusion in branch heads checking logic when topic in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4703
diff
changeset
|
1191 tip 3:9efc5c3ac635 |
5f90eb8fd63c
evolve: fix confusion in branch heads checking logic when topic in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4703
diff
changeset
|
1192 1.0 2:3bbb3fdb2546 |
4703
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1193 |
5686
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1194 test that being on active topic does not change output of `hg heads` |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1195 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1196 $ hg up 0 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1197 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1198 $ echo c > c |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1199 $ hg ci -Am "added c" --config experimental.topic-mode=default |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1200 adding c |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1201 $ hg log -G -T '{rev} {branch}{if("{topic}", "/{topic}")}\n' --rev 'all()' |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1202 @ 4 default |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1203 | |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1204 | o 3 default/foo |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1205 | | |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1206 | o 2 default/foo |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1207 |/ |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1208 o 0 default |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1209 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1210 $ hg heads |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1211 changeset: 4:29edef26570b |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1212 tag: tip |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1213 parent: 0:9092f1db7931 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1214 user: test |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1215 date: Thu Jan 01 00:00:00 1970 +0000 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1216 summary: added c |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1217 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1218 changeset: 3:9efc5c3ac635 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1219 topic: foo |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1220 user: test |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1221 date: Thu Jan 01 00:00:00 1970 +0000 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1222 summary: Added tag 1.0 for changeset 3bbb3fdb2546 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1223 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1224 $ hg topic foo |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1225 marked working directory as topic: foo |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1226 $ hg heads |
5687
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1227 changeset: 4:29edef26570b |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1228 tag: tip |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1229 parent: 0:9092f1db7931 |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1230 user: test |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1231 date: Thu Jan 01 00:00:00 1970 +0000 |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1232 summary: added c |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1233 |
5686
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1234 changeset: 3:9efc5c3ac635 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1235 topic: foo |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1236 user: test |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1237 date: Thu Jan 01 00:00:00 1970 +0000 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1238 summary: Added tag 1.0 for changeset 3bbb3fdb2546 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1239 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1240 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1241 $ hg up foo |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1242 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1243 $ hg heads |
5687
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1244 changeset: 4:29edef26570b |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1245 tag: tip |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1246 parent: 0:9092f1db7931 |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1247 user: test |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1248 date: Thu Jan 01 00:00:00 1970 +0000 |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1249 summary: added c |
d24669df9a4a
topic: look for topic heads only when necessary
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5686
diff
changeset
|
1250 |
5686
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1251 changeset: 3:9efc5c3ac635 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1252 topic: foo |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1253 user: test |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1254 date: Thu Jan 01 00:00:00 1970 +0000 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1255 summary: Added tag 1.0 for changeset 3bbb3fdb2546 |
ff84b99569b0
topic: a test to demonstrate a bug in branchheads()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5672
diff
changeset
|
1256 |
4703
e15dc6defc99
topic: add tests to demonstrate topic confuses the branchhead checking logic
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4648
diff
changeset
|
1257 $ cd .. |