Mercurial > evolve

comparison tests/test-topic-debugcb.t @ 2904:4ae89b5834e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: add a new root changeset to all debugconvertbookmark test case We'll make this root changeset public to check the debugconvertbookmark logic in that regards. It is added in its own changeset since it massively impact all output.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Sep 2017 16:51:49 +0200
parents d16781d7a061
children 610d06bcd714
comparison
equal deleted inserted replaced
2903:d16781d7a061 2904:4ae89b5834e6
15 Setting up the things 15 Setting up the things
16 --------------------- 16 ---------------------
17 17
18 $ hg init repo 18 $ hg init repo
19 $ cd repo 19 $ cd repo
20 $ echo "Hello" > root
21 $ hg commit -Aqm "root"
20 $ echo "Hello" > a 22 $ echo "Hello" > a
21 $ hg commit -Aqm "First commit" 23 $ hg commit -Aqm "First commit"
22 $ echo "Hello" > b 24 $ echo "Hello" > b
23 $ hg commit -Aqm "Second commit" 25 $ hg commit -Aqm "Second commit"
24 $ hg bookmark "hellos" 26 $ hg bookmark "hellos"
28 $ echo "Fix 2" > m 30 $ echo "Fix 2" > m
29 $ hg commit -Aqm "Fixing second" 31 $ hg commit -Aqm "Fixing second"
30 $ hg bookmark "secondfix" 32 $ hg bookmark "secondfix"
31 33
32 $ hg log -G 34 $ hg log -G
33 @ [3:b985e4fea4a4] Fixing second 35 @ [4:ec0e17135a94] Fixing second
34 | bookmark: secondfix 36 | bookmark: secondfix
35 o [2:8e79b09248c2] Fixing first 37 o [3:e05947b88d69] Fixing first
36 | 38 |
37 | o [1:50634233706a] Second commit 39 | o [2:f53d1144f925] Second commit
38 |/ bookmark: hellos 40 | | bookmark: hellos
39 o [0:3caf92e45cfb] First commit 41 | o [1:df1fd5e18154] First commit
42 |/
43 o [0:249055fcca50] root
40 44
41 45
42 Generic tests 46 Generic tests
43 ============= 47 =============
44 48
68 72
69 Changing a particular bookmark to topic 73 Changing a particular bookmark to topic
70 ======================================= 74 =======================================
71 75
72 $ hg debugconvertbookmark -b hellos 76 $ hg debugconvertbookmark -b hellos
73 changed topic to "hellos" on 1 revisions 77 changed topic to "hellos" on 2 revisions
74 $ hg log -G 78 $ hg log -G
75 o [4:ca8825a7eb18] Second commit 79 o [6:98ae7930f6ed] Second commit
76 | topic: hellos 80 | topic: hellos
77 | @ [3:b985e4fea4a4] Fixing second 81 o [5:ff69f6ee4618] First commit
82 | topic: hellos
83 | @ [4:ec0e17135a94] Fixing second
78 | | bookmark: secondfix 84 | | bookmark: secondfix
79 | o [2:8e79b09248c2] Fixing first 85 | o [3:e05947b88d69] Fixing first
80 |/ 86 |/
81 o [0:3caf92e45cfb] First commit 87 o [0:249055fcca50] root
82 88
83 89
84 Changing all bookmarks to topic 90 Changing all bookmarks to topic
85 =============================== 91 ===============================
86 92
89 95
90 $ hg debugconvertbookmark --all 96 $ hg debugconvertbookmark --all
91 switching to topic secondfix 97 switching to topic secondfix
92 changed topic to "secondfix" on 2 revisions 98 changed topic to "secondfix" on 2 revisions
93 $ hg log -G 99 $ hg log -G
94 @ [6:6efc0524f97a] Fixing second 100 @ [8:5f0f9cc1979a] Fixing second
95 | topic: secondfix 101 | topic: secondfix
96 o [5:0a4244c62a16] Fixing first 102 o [7:f8ecbf3b10be] Fixing first
97 | topic: secondfix 103 | topic: secondfix
98 | o [4:ca8825a7eb18] Second commit 104 | o [6:98ae7930f6ed] Second commit
105 | | topic: hellos
106 | o [5:ff69f6ee4618] First commit
99 |/ topic: hellos 107 |/ topic: hellos
100 o [0:3caf92e45cfb] First commit 108 o [0:249055fcca50] root
101 109
102 110
103 Trying with multiple bookmarks on a single changeset 111 Trying with multiple bookmarks on a single changeset
104 ---------------------------------------------------- 112 ----------------------------------------------------
105 113
106 $ echo "multiple bookmarks" >> m 114 $ echo "multiple bookmarks" >> m
107 $ hg commit -Aqm "Trying multiple bookmarks" 115 $ hg commit -Aqm "Trying multiple bookmarks"
108 $ hg bookmark book1 116 $ hg bookmark book1
109 $ hg bookmark book2 117 $ hg bookmark book2
110 $ hg log -G 118 $ hg log -G
111 @ [7:7c46b4bbdda3] Trying multiple bookmarks 119 @ [9:4ad3e7d421d4] Trying multiple bookmarks
112 | bookmark: book1 120 | bookmark: book1
113 | bookmark:book2 121 | bookmark:book2
114 | topic: secondfix 122 | topic: secondfix
115 o [6:6efc0524f97a] Fixing second 123 o [8:5f0f9cc1979a] Fixing second
116 | topic: secondfix 124 | topic: secondfix
117 o [5:0a4244c62a16] Fixing first 125 o [7:f8ecbf3b10be] Fixing first
118 | topic: secondfix 126 | topic: secondfix
119 | o [4:ca8825a7eb18] Second commit 127 | o [6:98ae7930f6ed] Second commit
128 | | topic: hellos
129 | o [5:ff69f6ee4618] First commit
120 |/ topic: hellos 130 |/ topic: hellos
121 o [0:3caf92e45cfb] First commit 131 o [0:249055fcca50] root
122 132
123 $ hg debugconvertbookmark --all 133 $ hg debugconvertbookmark --all
124 skipping '7' as it has multiple bookmarks on it 134 skipping '9' as it has multiple bookmarks on it
125 $ hg log -G 135 $ hg log -G
126 @ [7:7c46b4bbdda3] Trying multiple bookmarks 136 @ [9:4ad3e7d421d4] Trying multiple bookmarks
127 | bookmark: book1 137 | bookmark: book1
128 | bookmark:book2 138 | bookmark:book2
129 | topic: secondfix 139 | topic: secondfix
130 o [6:6efc0524f97a] Fixing second 140 o [8:5f0f9cc1979a] Fixing second
131 | topic: secondfix 141 | topic: secondfix
132 o [5:0a4244c62a16] Fixing first 142 o [7:f8ecbf3b10be] Fixing first
133 | topic: secondfix 143 | topic: secondfix
134 | o [4:ca8825a7eb18] Second commit 144 | o [6:98ae7930f6ed] Second commit
145 | | topic: hellos
146 | o [5:ff69f6ee4618] First commit
135 |/ topic: hellos 147 |/ topic: hellos
136 o [0:3caf92e45cfb] First commit 148 o [0:249055fcca50] root
137 149
138 150
139 Two bookmarks on two different topological branches 151 Two bookmarks on two different topological branches
140 --------------------------------------------------- 152 ---------------------------------------------------
141 153
142 $ cd .. 154 $ cd ..
143 $ rm -rf repo 155 $ rm -rf repo
144 $ hg init setup1 156 $ hg init setup1
145 $ cd setup1 157 $ cd setup1
158 $ echo "Hello" > root
159 $ hg commit -Aqm "root"
146 $ echo "Hello" > A 160 $ echo "Hello" > A
147 $ hg commit -Aqm "A" 161 $ hg commit -Aqm "A"
148 $ echo "Hello" > B 162 $ echo "Hello" > B
149 $ hg commit -Aqm "B" 163 $ hg commit -Aqm "B"
150 $ echo "Hello" > C 164 $ echo "Hello" > C
159 $ hg commit -Aqm "F" 173 $ hg commit -Aqm "F"
160 $ hg bookmark -r 'desc(D)' bar 174 $ hg bookmark -r 'desc(D)' bar
161 $ hg bookmark -r 'desc(F)' foo 175 $ hg bookmark -r 'desc(F)' foo
162 176
163 $ hg log -G 177 $ hg log -G
164 @ [5:5a63fc519ddc] F 178 @ [6:32f4660df717] F
165 | bookmark: foo 179 | bookmark: foo
166 o [4:a9fc8fb0c70c] E 180 o [5:d4608d9df75e] E
167 | 181 |
168 | o [3:e92ae92e366f] D 182 | o [4:4963af405f62] D
169 | | bookmark: bar 183 | | bookmark: bar
170 | o [2:9cc6a71c9557] C 184 | o [3:ac05e0d05d00] C
171 |/ 185 |/
172 o [1:a7922543592c] B 186 o [2:10f317d09e78] B
173 | 187 |
174 o [0:fc58adec4bcd] A 188 o [1:e34122c9a2bf] A
189 |
190 o [0:249055fcca50] root
175 191
176 $ hg debugconvertbookmark --all 192 $ hg debugconvertbookmark --all
177 changed topic to "bar" on 2 revisions 193 changed topic to "bar" on 2 revisions
178 switching to topic foo 194 switching to topic foo
179 changed topic to "foo" on 2 revisions 195 changed topic to "foo" on 2 revisions
180 $ hg log -G 196 $ hg log -G
181 @ [9:994cbef2c2d2] F 197 @ [10:f0b5f2a5f31a] F
182 | topic: foo 198 | topic: foo
183 o [8:b9d8ef5d5b8a] E 199 o [9:7affa1350ff0] E
184 | topic: foo 200 | topic: foo
185 | o [7:e8ba703ef9ab] D 201 | o [8:a1bb64d88f0e] D
186 | | topic: bar 202 | | topic: bar
187 | o [6:6307829aaf11] C 203 | o [7:71827f564e9e] C
188 |/ topic: bar 204 |/ topic: bar
189 o [1:a7922543592c] B 205 o [2:10f317d09e78] B
190 | 206 |
191 o [0:fc58adec4bcd] A 207 o [1:e34122c9a2bf] A
208 |
209 o [0:249055fcca50] root
192 210
193 211
194 Two bookmarks on top of each other 212 Two bookmarks on top of each other
195 ---------------------------------- 213 ----------------------------------
196 214
197 $ cd .. 215 $ cd ..
198 $ rm -rf setup1 216 $ rm -rf setup1
199 $ hg init setup2 217 $ hg init setup2
200 $ cd setup2 218 $ cd setup2
219 $ echo "Hello" > root
220 $ hg commit -Aqm "root"
201 $ echo "Hello" > A 221 $ echo "Hello" > A
202 $ hg commit -Aqm "A" 222 $ hg commit -Aqm "A"
203 $ hg phase --public . 223 $ hg phase --public .
204 $ echo "Hello" > B 224 $ echo "Hello" > B
205 $ hg commit -Aqm "B" 225 $ hg commit -Aqm "B"
211 $ echo "Hello" > E 231 $ echo "Hello" > E
212 $ hg commit -Aqm "E" 232 $ hg commit -Aqm "E"
213 $ hg bookmark -r . foo 233 $ hg bookmark -r . foo
214 234
215 $ hg log -G 235 $ hg log -G
216 @ [4:ef9d596cf6ea] E 236 @ [5:c633aa1ad270] E
217 | bookmark: foo 237 | bookmark: foo
218 o [3:e92ae92e366f] D 238 o [4:4963af405f62] D
219 | 239 |
220 o [2:9cc6a71c9557] C 240 o [3:ac05e0d05d00] C
221 | bookmark: bar 241 | bookmark: bar
222 o [1:a7922543592c] B 242 o [2:10f317d09e78] B
223 | 243 |
224 o [0:fc58adec4bcd] A 244 o [1:e34122c9a2bf] A
245 |
246 o [0:249055fcca50] root
225 247
226 248
227 XXX: this should bot only put topic 'foo' on 3,4 but also 'bar' on 0,1,2 249 XXX: this should bot only put topic 'foo' on 3,4 but also 'bar' on 0,1,2
228 250
229 $ hg debugconvertbookmark --all 251 $ hg debugconvertbookmark --all
230 switching to topic foo 252 switching to topic foo
231 changed topic to "foo" on 2 revisions 253 changed topic to "foo" on 2 revisions
232 254
233 $ hg log -G 255 $ hg log -G
234 @ [6:e2bbb25b8882] E 256 @ [7:b14d13efcfa7] E
235 | topic: foo 257 | topic: foo
236 o [5:71bced29cbae] D 258 o [6:c89ca6e70978] D
237 | topic: foo 259 | topic: foo
238 o [2:9cc6a71c9557] C 260 o [3:ac05e0d05d00] C
239 | bookmark: bar 261 | bookmark: bar
240 o [1:a7922543592c] B 262 o [2:10f317d09e78] B
241 | 263 |
242 o [0:fc58adec4bcd] A 264 o [1:e34122c9a2bf] A
243 265 |
266 o [0:249055fcca50] root
267