Mercurial > evolve
annotate tests/test-namespaces.t @ 6543:b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 31 Jul 2023 16:47:42 -0300 |
parents | ca1c219bd59f |
children | fa14b9fc953d |
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 |
6239
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
8 $ hg debug-topic-namespace space-name |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
9 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
|
10 $ hg debug-topic-namespaces |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
11 space-name |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
12 |
6241
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
13 $ hg log -r 'wdir()' -T '{topic_namespace}\n' |
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
14 space-name |
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
15 |
6243
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
16 $ hg log -r 'wdir()' -T '{fqbn}\n' |
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
17 default//space-name/ |
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
18 |
6239
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
19 $ hg branches |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
20 |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
21 $ hg debug-topic-namespace --clear |
6238
6bbd16579f0f
topic: list namespaces with debug-namespaces
Anton Shestakov <av6@dwimlabs.net>
parents:
6237
diff
changeset
|
22 $ hg debug-topic-namespaces |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
23 |
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
24 $ hg topics |
6238
6bbd16579f0f
topic: list namespaces with debug-namespaces
Anton Shestakov <av6@dwimlabs.net>
parents:
6237
diff
changeset
|
25 |
6239
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
26 $ hg debugtopicnamespace --clear nonsense |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
27 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
|
28 [255] |
8861e33f3bb2
topic: setting current repo namespace with debug-namespace
Anton Shestakov <av6@dwimlabs.net>
parents:
6238
diff
changeset
|
29 |
6240
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
30 $ hg branch stable |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
31 marked working directory as branch stable |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
32 (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
|
33 $ hg debug-topic-namespace alice |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
34 marked working directory as topic namespace: alice |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
35 $ hg topic feature |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
36 marked working directory as topic: feature |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
37 $ echo a > a |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
38 $ hg ci -qAm a |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
39 |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
40 $ hg debug-topic-namespaces |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
41 alice |
2686ecc90791
topic: store topic namespace in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6239
diff
changeset
|
42 |
6241
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
43 $ hg log -r . -T '{rev}: {branch} {topic_namespace} {topic}\n' |
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
44 0: stable alice feature |
85abf58c3d8c
topic: namespace template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6240
diff
changeset
|
45 |
6243
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
46 $ hg log -r . -T '{rev}: {fqbn}\n' |
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
47 0: stable//alice/feature |
91d9a279b84a
topic: fqbn template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
6241
diff
changeset
|
48 |
6271
caf302fb8f4d
topic: use branch//namespace/topic format everywhere except exchange
Anton Shestakov <av6@dwimlabs.net>
parents:
6267
diff
changeset
|
49 $ hg branches |
caf302fb8f4d
topic: use branch//namespace/topic format everywhere except exchange
Anton Shestakov <av6@dwimlabs.net>
parents:
6267
diff
changeset
|
50 stable//alice/feature 0:69c7dbf6acd1 |
caf302fb8f4d
topic: use branch//namespace/topic format everywhere except exchange
Anton Shestakov <av6@dwimlabs.net>
parents:
6267
diff
changeset
|
51 |
6245
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
52 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
|
53 |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
54 $ 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
|
55 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
|
56 $ hg debug-topic-namespace |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
57 none |
6245
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
58 $ hg topics |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
59 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
|
60 $ 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
|
61 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
|
62 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
|
63 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
|
64 $ 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
|
65 alice |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
66 $ hg topics |
a54db3e55c88
topic: switch to namespace when updating to a commit, similar to topic
Anton Shestakov <av6@dwimlabs.net>
parents:
6243
diff
changeset
|
67 * 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
|
68 |
6310
43166bd57d6c
tests: addressing topic namespaces by name alone is not supported
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
69 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
|
70 |
43166bd57d6c
tests: addressing topic namespaces by name alone is not supported
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
71 $ hg up alice |
43166bd57d6c
tests: addressing topic namespaces by name alone is not supported
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
72 abort: unknown revision 'alice' |
43166bd57d6c
tests: addressing topic namespaces by name alone is not supported
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
73 [10] |
43166bd57d6c
tests: addressing topic namespaces by name alone is not supported
Anton Shestakov <av6@dwimlabs.net>
parents:
6271
diff
changeset
|
74 |
6536
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
75 Export/import of topic namespaces |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
76 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
77 $ hg export |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
78 # HG changeset patch |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
79 # User test |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
80 # Date 0 0 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
81 # Thu Jan 01 00:00:00 1970 +0000 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
82 # Branch stable |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
83 # Node ID 69c7dbf6acd180eeec055dd67933badd3601d45f |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
84 # Parent 0000000000000000000000000000000000000000 |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
85 # EXP-Topic-Namespace alice |
6536
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
86 # EXP-Topic feature |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
87 a |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
88 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
89 diff -r 000000000000 -r 69c7dbf6acd1 a |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
90 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
91 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
92 @@ -0,0 +1,1 @@ |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
93 +a |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
94 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
95 $ hg import - << EOF |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
96 > # HG changeset patch |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
97 > # User test |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
98 > # Date 0 0 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
99 > # Thu Jan 01 00:00:00 1970 +0000 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
100 > # Branch another-branch |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
101 > # Node ID 1111111111111111111111111111111111111111 |
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
102 > # Parent 2222222222222222222222222222222222222222 |
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
103 > # EXP-Topic-Namespace mynamespace |
6536
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
104 > # EXP-Topic mytopic |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
105 > added z |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
106 > |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
107 > diff --git a/z b/z |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
108 > new file mode 100644 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
109 > --- /dev/null |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
110 > +++ b/z |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
111 > @@ -0,0 +1,1 @@ |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
112 > +z |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
113 > EOF |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
114 applying patch from stdin |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
115 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
116 $ hg log -r tip -T '{rev}: {branch} {topic_namespace} {topic}\n' |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
117 1: stable mynamespace mytopic |
6536
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
118 |
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
119 $ hg log -r tip -T '{rev}: {fqbn}\n' |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
120 1: stable//mynamespace/mytopic |
6536
90b631fde2d7
topic: only set topic on workingcommitctx if it doesn't already have one
Anton Shestakov <av6@dwimlabs.net>
parents:
6310
diff
changeset
|
121 |
6543
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
122 Importing a patch with default namespace and topic values |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
123 |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
124 $ hg import - << EOF |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
125 > # HG changeset patch |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
126 > # User test |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
127 > # Date 0 0 |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
128 > # Thu Jan 01 00:00:00 1970 +0000 |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
129 > # Branch stable |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
130 > # Node ID 1111111111111111111111111111111111111111 |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
131 > # Parent 2222222222222222222222222222222222222222 |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
132 > # EXP-Topic-Namespace none |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
133 > # EXP-Topic |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
134 > more z |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
135 > |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
136 > diff --git a/z b/z |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
137 > --- a/z |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
138 > +++ b/z |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
139 > @@ -1,1 +1,1 @@ |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
140 > -z |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
141 > +zebra |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
142 > EOF |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
143 applying patch from stdin |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
144 |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
145 $ hg log -r tip -T '{rev}: {branch} {topic_namespace} {topic}\n' |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
146 2: stable none |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
147 |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
148 $ hg log -r tip -T '{rev}: {fqbn}\n' |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
149 2: stable |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
150 |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
151 $ hg log -r tip -T '{rev}: {join(extras, " ")}\n' |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
152 2: branch=stable |
b0cbad4d841f
tests: importing with default topic&namespace values doesn't add extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6542
diff
changeset
|
153 |
6261
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
154 Revsets |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
155 |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
156 $ nslog() { |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
157 > hg log -T '{rev}: {topic_namespace}\n' -r "$1" |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
158 > } |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
159 |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
160 $ nslog 'topicnamespace()' |
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
161 0: alice |
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
162 1: mynamespace |
6261
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
163 $ nslog 'topicnamespace(:)' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
164 0: alice |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
165 1: mynamespace |
6261
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
166 $ nslog 'topicnamespace(all())' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
167 0: alice |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
168 1: mynamespace |
6261
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
169 $ nslog 'topicnamespace(topicnamespace("alice"))' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
170 0: alice |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
171 $ nslog 'topicnamespace(wdir())' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
172 0: alice |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
173 $ nslog 'topicnamespace("re:ice$")' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
174 0: alice |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
175 $ nslog 'topicnamespace(nonsense)' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
176 abort: unknown revision 'nonsense' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
177 [10] |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
178 |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
179 $ nslog 'topicnamespace("re:nonsense")' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
180 $ nslog 'topicnamespace("literal:nonsense")' |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
181 abort: topic namespace 'nonsense' does not exist |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
182 [10] |
a2491c578d2b
topic: namespace revset predicate
Anton Shestakov <av6@dwimlabs.net>
parents:
6245
diff
changeset
|
183 |
6236
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
184 Parsing |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
185 |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
186 $ hg debugparsefqbn foo/bar//user26/feature -T '[{branch}] <{topic_namespace}> ({topic})\n' |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
187 [foo/bar] <user26> (feature) |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
188 |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
189 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
|
190 $ hg debug-parse-fqbn foo/bar |
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
191 branch: foo/bar |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
192 namespace: none |
6236
7ad8107d953a
topic: introduce topic namespaces concept starting with simple parsing
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
193 topic: |
6237
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
194 |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
195 Formatting |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
196 |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
197 $ hg debugformatfqbn -b branch -n namespace -t topic |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
198 branch//namespace/topic |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
199 |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
200 $ 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
|
201 //namespace/ |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
202 |
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
203 $ 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
|
204 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
|
205 |
6266
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
206 default values |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
207 |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
208 $ hg debug-format-fqbn -b default -n none -t '' --no-short |
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
209 default//none/ |
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
210 $ 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
|
211 default |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
212 |
6267
1eb543272657
topic: switch to the short fqbn format by default
Anton Shestakov <av6@dwimlabs.net>
parents:
6266
diff
changeset
|
213 $ 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
|
214 default//namespace/ |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
215 $ 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
|
216 default//namespace/ |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
217 |
6542
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
218 $ hg debug-format-fqbn -b default -n none -t topic --no-short |
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
219 default//none/topic |
ca1c219bd59f
branching: merge with stable
Anton Shestakov <av6@dwimlabs.net>
parents:
6536
diff
changeset
|
220 $ 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
|
221 default//topic |
213db29a19e9
topic: ability to shorten branch//namespace/topic strings when possible
Anton Shestakov <av6@dwimlabs.net>
parents:
6261
diff
changeset
|
222 |
6237
0b9042408809
topic: formatting branch, namespace and topic into fully qualified branch name
Anton Shestakov <av6@dwimlabs.net>
parents:
6236
diff
changeset
|
223 $ cd .. |