Mercurial > evolve
annotate tests/test-namespaces.t @ 6585:a62308fb15c1 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 14 Oct 2023 13:34:03 -0300 |
parents | b1712eeb97c6 1328195f76a9 |
children | e2fbec28654c |
rev | line source |
---|---|
6236
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
1 https://www.mercurial-scm.org/wiki/TopicPlan#sub_branches.2C_namespacing_and_representation |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
2 |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
3 $ . "$TESTDIR/testlib/topic_setup.sh" |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
4 |
6238
6bbd16579f0f
topic: list namespaces with debug-namespaces
Anton Shestakov <av6@dwimlabs.net>
parents:
6237
diff
changeset
|
5 $ hg init repo |
6bbd16579f0f
topic: list namespaces with debug-namespaces
Anton Shestakov <av6@dwimlabs.net>
parents:
6237
diff
changeset
|
6 $ cd repo |
6bbd16579f0f
topic: list namespaces with debug-namespaces
Anton Shestakov <av6@dwimlabs.net>
parents:
6237
diff
changeset
|
7 |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
8 Setting a topic namespace alone doesn't affect wdir() |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
9 |
6239
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
10 $ hg debug-topic-namespace space-name |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
11 marked working directory as topic namespace: space-name |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
12 $ hg debug-topic-namespaces |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
13 space-name |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
14 |
6241
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
15 $ hg log -r 'wdir()' -T '{topic_namespace}\n' |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
16 none |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
17 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
18 $ hg log -r 'wdir()' -T '{fqbn}\n' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
19 default |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
20 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
21 But after setting a topic the already-set namespace is visible on wdir() |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
22 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
23 $ hg topic feature |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
24 marked working directory as topic: feature |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
25 $ hg topics |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
26 * feature (0 changesets) |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
27 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
28 $ hg log -r 'wdir()' -T '{topic_namespace}\n' |
6241
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
29 space-name |
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
30 |
6243
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
31 $ hg log -r 'wdir()' -T '{fqbn}\n' |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
32 default//space-name/feature |
6243
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
33 |
6239
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
34 $ hg branches |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
35 |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
36 $ hg debug-topic-namespace --clear |
6238
6bbd16579f0f
topic: list namespaces with debug-namespaces
Anton Shestakov <av6@dwimlabs.net>
parents:
6237
diff
changeset
|
37 $ hg debug-topic-namespaces |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
38 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
39 $ hg topic --clear |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
40 clearing empty topic "feature" |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
41 $ hg topics |
6238
6bbd16579f0f
topic: list namespaces with debug-namespaces
Anton Shestakov <av6@dwimlabs.net>
parents:
6237
diff
changeset
|
42 |
6395
1328195f76a9
test-compat: merge mercurial-5.7 into mercurial-5.6
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
43 $ hg debug-topic-namespace --clear nonsense |
6239
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
44 abort: cannot use --clear when setting a topic namespace |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
45 [255] |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
46 |
6240
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
47 $ hg branch stable |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
48 marked working directory as branch stable |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
49 (branches are permanent and global, did you want a bookmark?) |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
50 $ hg debug-topic-namespace alice |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
51 marked working directory as topic namespace: alice |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
52 $ hg topic feature |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
53 marked working directory as topic: feature |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
54 $ echo a > a |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
55 $ hg ci -qAm a |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
56 |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
57 $ hg debug-topic-namespaces |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
58 alice |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
59 |
6241
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
60 $ hg log -r . -T '{rev}: {branch} {topic_namespace} {topic}\n' |
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
61 0: stable alice feature |
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
62 |
6243
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
63 $ hg log -r . -T '{rev}: {fqbn}\n' |
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
64 0: stable//alice/feature |
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
65 |
6271
caf302fb8f4d
topic: use branch//namespace/topic format everywhere except exchange
Anton Shestakov <av6@dwimlabs.net>
parents:
6267
diff
changeset
|
66 $ hg branches |
caf302fb8f4d
topic: use branch//namespace/topic format everywhere except exchange
Anton Shestakov <av6@dwimlabs.net>
parents:
6267
diff
changeset
|
67 stable//alice/feature 0:69c7dbf6acd1 |
caf302fb8f4d
topic: use branch//namespace/topic format everywhere except exchange
Anton Shestakov <av6@dwimlabs.net>
parents:
6267
diff
changeset
|
68 |
6245
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
69 Updating to a revision with a namespace should activate it |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
70 |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
71 $ hg up null |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
72 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
73 $ hg debug-topic-namespace |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
74 none |
6245
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
75 $ hg topics |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
76 feature (1 changesets) |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
77 $ hg up 0 |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
78 switching to topic-namespace alice |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
79 switching to topic feature |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
81 $ hg debug-topic-namespace |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
82 alice |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
83 $ hg topics |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
84 * feature (1 changesets) |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
85 |
6310
43166bd57d6c
tests: addressing topic namespaces by name alone is not supported
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
86 Updating to a topic namespace is not supported |
43166bd57d6c
tests: addressing topic namespaces by name alone is not supported
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
87 |
43166bd57d6c
tests: addressing topic namespaces by name alone is not supported
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
88 $ hg up alice |
6395
1328195f76a9
test-compat: merge mercurial-5.7 into mercurial-5.6
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
89 abort: unknown revision 'alice'! |
6392
faea18a26188
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
90 [255] |
6310
43166bd57d6c
tests: addressing topic namespaces by name alone is not supported
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
91 |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
92 Export/import of topic namespaces |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
93 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
94 $ hg export |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
95 # HG changeset patch |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
96 # User test |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
97 # Date 0 0 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
98 # Thu Jan 01 00:00:00 1970 +0000 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
99 # Branch stable |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
100 # Node ID 69c7dbf6acd180eeec055dd67933badd3601d45f |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
101 # Parent 0000000000000000000000000000000000000000 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
102 # EXP-Topic-Namespace alice |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
103 # EXP-Topic feature |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
104 a |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
105 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
106 diff -r 000000000000 -r 69c7dbf6acd1 a |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
107 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
108 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
109 @@ -0,0 +1,1 @@ |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
110 +a |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
111 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
112 $ hg import - << EOF |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
113 > # HG changeset patch |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
114 > # User test |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
115 > # Date 0 0 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
116 > # Thu Jan 01 00:00:00 1970 +0000 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
117 > # Branch another-branch |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
118 > # Node ID 1111111111111111111111111111111111111111 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
119 > # Parent 2222222222222222222222222222222222222222 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
120 > # EXP-Topic-Namespace mynamespace |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
121 > # EXP-Topic mytopic |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
122 > added z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
123 > |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
124 > diff --git a/z b/z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
125 > new file mode 100644 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
126 > --- /dev/null |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
127 > +++ b/z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
128 > @@ -0,0 +1,1 @@ |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
129 > +z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
130 > EOF |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
131 applying patch from stdin |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
132 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
133 $ hg log -r tip -T '{rev}: {branch} {topic_namespace} {topic}\n' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
134 1: stable mynamespace mytopic |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
135 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
136 $ hg log -r tip -T '{rev}: {fqbn}\n' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
137 1: stable//mynamespace/mytopic |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
138 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
139 $ hg log -r tip -T '{rev}: {join(extras, " ")}\n' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
140 1: branch=stable topic=mytopic topic-namespace=mynamespace |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
141 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
142 Importing a patch with default namespace and topic values |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
143 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
144 $ hg import - << EOF |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
145 > # HG changeset patch |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
146 > # User test |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
147 > # Date 0 0 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
148 > # Thu Jan 01 00:00:00 1970 +0000 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
149 > # Branch stable |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
150 > # Node ID 1111111111111111111111111111111111111111 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
151 > # Parent 2222222222222222222222222222222222222222 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
152 > # EXP-Topic-Namespace none |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
153 > # EXP-Topic |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
154 > more z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
155 > |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
156 > diff --git a/z b/z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
157 > --- a/z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
158 > +++ b/z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
159 > @@ -1,1 +1,1 @@ |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
160 > -z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
161 > +zebra |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
162 > EOF |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
163 applying patch from stdin |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
164 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
165 $ hg log -r tip -T '{rev}: {branch} {topic_namespace} {topic}\n' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
166 2: stable none |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
167 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
168 $ hg log -r tip -T '{rev}: {fqbn}\n' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
169 2: stable |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
170 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
171 $ hg log -r tip -T '{rev}: {join(extras, " ")}\n' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
172 2: branch=stable |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
173 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
174 Importing a patch with topic namespace set and topic unset |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
175 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
176 $ hg import - << EOF |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
177 > # HG changeset patch |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
178 > # User test |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
179 > # Date 0 0 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
180 > # Thu Jan 01 00:00:00 1970 +0000 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
181 > # Branch stable |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
182 > # Node ID 1111111111111111111111111111111111111111 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
183 > # Parent 2222222222222222222222222222222222222222 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
184 > # EXP-Topic-Namespace mynamespace |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
185 > # EXP-Topic |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
186 > more z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
187 > |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
188 > diff --git a/z b/z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
189 > --- a/z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
190 > +++ b/z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
191 > @@ -1,1 +1,1 @@ |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
192 > -zebra |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
193 > +z |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
194 > EOF |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
195 applying patch from stdin |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
196 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
197 $ hg log -r tip -T '{rev}: {branch} {topic_namespace} {topic}\n' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
198 3: stable none |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
199 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
200 $ hg log -r tip -T '{rev}: {fqbn}\n' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
201 3: stable |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
202 |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
203 $ hg log -r tip -T '{rev}: {join(extras, " ")}\n' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
204 3: branch=stable |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
205 |
6261
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
206 Revsets |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
207 |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
208 $ nslog() { |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
209 > hg log -T '{rev}: {topic_namespace}\n' -r "$1" |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
210 > } |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
211 |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
212 $ nslog 'topicnamespace()' |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
213 0: alice |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
214 1: mynamespace |
6261
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
215 $ nslog 'topicnamespace(:)' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
216 0: alice |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
217 1: mynamespace |
6261
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
218 $ nslog 'topicnamespace(all())' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
219 0: alice |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
220 1: mynamespace |
6261
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
221 $ nslog 'topicnamespace(topicnamespace("alice"))' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
222 0: alice |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
223 $ nslog 'topicnamespace(wdir())' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
224 0: alice |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
225 $ nslog 'topicnamespace("re:ice$")' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
226 0: alice |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
227 $ nslog 'topicnamespace(nonsense)' |
6395
1328195f76a9
test-compat: merge mercurial-5.7 into mercurial-5.6
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
228 abort: unknown revision 'nonsense'! |
6392
faea18a26188
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
229 [255] |
6261
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
230 |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
231 $ nslog 'topicnamespace("re:nonsense")' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
232 $ nslog 'topicnamespace("literal:nonsense")' |
6395
1328195f76a9
test-compat: merge mercurial-5.7 into mercurial-5.6
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
233 abort: topic namespace 'nonsense' does not exist! |
6392
faea18a26188
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
234 [255] |
6261
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
235 |
6236
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
236 Parsing |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
237 |
6395
1328195f76a9
test-compat: merge mercurial-5.7 into mercurial-5.6
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
238 $ hg debug-parse-fqbn foo/bar//user26/feature -T '[{branch}] <{topic_namespace}> ({topic})\n' |
6236
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
239 [foo/bar] <user26> (feature) |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
240 |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
241 no double slashes means it's a named branch |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
242 $ hg debug-parse-fqbn foo/bar |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
243 branch: foo/bar |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
244 namespace: none |
6236
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
245 topic: |
6237
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
246 |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
247 Formatting |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
248 |
6395
1328195f76a9
test-compat: merge mercurial-5.7 into mercurial-5.6
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
249 $ hg debug-format-fqbn -b branch -n namespace -t topic |
6237
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
250 branch//namespace/topic |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
251 |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
252 $ hg debug-format-fqbn -n namespace |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
253 //namespace/ |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
254 |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
255 $ hg debug-format-fqbn -b foo/bar -n user26 -t feature |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
256 foo/bar//user26/feature |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
257 |
6266
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
258 default values |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
259 |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
260 $ hg debug-format-fqbn -b default -n none -t '' --no-short |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
261 default//none/ |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
262 $ hg debug-format-fqbn -b default -n none -t '' --short |
6266
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
263 default |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
264 |
6267
1eb543272657
topic: switch to the short fqbn format by default
Anton Shestakov <av6@dwimlabs.net>
parents:
6266
diff
changeset
|
265 $ hg debug-format-fqbn -b default -n namespace -t '' --no-short |
6266
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
266 default//namespace/ |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
267 $ hg debug-format-fqbn -b default -n namespace -t '' --short |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
268 default//namespace/ |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
269 |
6582
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
270 $ hg debug-format-fqbn -b default -n none -t topic --no-short |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
271 default//none/topic |
b1712eeb97c6
test-compat: merge mercurial-6.0 into mercurial-5.9
Anton Shestakov <av6@dwimlabs.net>
parents:
6392
diff
changeset
|
272 $ hg debug-format-fqbn -b default -n none -t topic --short |
6266
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
273 default//topic |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
274 |
6237
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
275 $ cd .. |