comparison tests/test-topic-flow-publish-bare.t @ 6403:567cc86f2d01 mercurial-4.8

test-compat: merge mercurial-4.9 into mercurial-4.8
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 07 Feb 2023 15:07:02 +0400
parents 6b67f26f4667 60daa7887c49
children
comparison
equal deleted inserted replaced
6357:af69ae146159 6403:567cc86f2d01
96 pushing something not on default 96 pushing something not on default
97 -------------------------------- 97 --------------------------------
98 98
99 $ hg update 'desc("ROOT")' 99 $ hg update 'desc("ROOT")'
100 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 100 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
101 $ hg branch branchA 101 $ hg branch double//slash
102 marked working directory as branch branchA 102 marked working directory as branch double//slash
103 (branches are permanent and global, did you want a bookmark?) 103 (branches are permanent and global, did you want a bookmark?)
104 $ mkcommit c_aE0 104 $ mkcommit c_aE0
105 $ hg push --new-branch 105 $ hg push --new-branch
106 pushing to $TESTTMP/bare-branch-server 106 pushing to $TESTTMP/bare-branch-server
107 1 changesets about to be published 107 1 changesets about to be published
109 adding changesets 109 adding changesets
110 adding manifests 110 adding manifests
111 adding file changes 111 adding file changes
112 added 1 changesets with 1 changes to 1 files (+1 heads) 112 added 1 changesets with 1 changes to 1 files (+1 heads)
113 $ hg tgl 'all()' 113 $ hg tgl 'all()'
114 @ 5:0db08e758601 c_aE0 public branchA 114 @ 5:ffb83c22f2ce c_aE0 public double//slash
115 | 115 |
116 | o 4:9bf953aa81f6 c_dD0 public default 116 | o 4:9bf953aa81f6 c_dD0 public default
117 | | 117 | |
118 | | o 3:9d5b8e1f08a4 c_dC0 public default 118 | | o 3:9d5b8e1f08a4 c_dC0 public default
119 | |/ 119 | |/
150 |/ 150 |/
151 | o 2:286d02a6e2a2 c_dB0 public default 151 | o 2:286d02a6e2a2 c_dB0 public default
152 |/ 152 |/
153 o 1:134bc3852ad2 c_dA0 public default 153 o 1:134bc3852ad2 c_dA0 public default
154 | 154 |
155 | o 5:0db08e758601 c_aE0 public branchA 155 | o 5:ffb83c22f2ce c_aE0 public double//slash
156 |/ 156 |/
157 o 0:ea207398892e ROOT public default 157 o 0:ea207398892e ROOT public default
158 158
159 159
160 pushing topic over a bare branch 160 pushing topic over a bare branch
189 | | 189 | |
190 | o 4:9bf953aa81f6 c_dD0 public default 190 | o 4:9bf953aa81f6 c_dD0 public default
191 |/ 191 |/
192 o 1:134bc3852ad2 c_dA0 public default 192 o 1:134bc3852ad2 c_dA0 public default
193 | 193 |
194 | o 5:0db08e758601 c_aE0 public branchA 194 | o 5:ffb83c22f2ce c_aE0 public double//slash
195 |/ 195 |/
196 o 0:ea207398892e ROOT public default 196 o 0:ea207398892e ROOT public default
197 197
198 198
199 Pushing topic in between bare branch 199 Pushing topic in between bare branch
216 adding changesets 216 adding changesets
217 adding manifests 217 adding manifests
218 adding file changes 218 adding file changes
219 added 3 changesets with 3 changes to 3 files 219 added 3 changesets with 3 changes to 3 files
220 $ hg tgl 'all()' 220 $ hg tgl 'all()'
221 @ 11:b0a00ebdfd24 c_aK0 public branchA 221 @ 11:a6836f5ce4fe c_aK0 public double//slash
222 | 222 |
223 o 5:0db08e758601 c_aE0 public branchA 223 o 5:ffb83c22f2ce c_aE0 public double//slash
224 | 224 |
225 | o 10:abb5c84eb9e9 c_dJ0 draft default bar 225 | o 10:abb5c84eb9e9 c_dJ0 draft default bar
226 | | 226 | |
227 | o 8:858be9a8daaf c_dH0 draft default bar 227 | o 8:858be9a8daaf c_dH0 draft default bar
228 | | 228 | |
279 | | 279 | |
280 | o 2:286d02a6e2a2 c_dB0 public default 280 | o 2:286d02a6e2a2 c_dB0 public default
281 |/ 281 |/
282 o 1:134bc3852ad2 c_dA0 public default 282 o 1:134bc3852ad2 c_dA0 public default
283 | 283 |
284 | o 11:b0a00ebdfd24 c_aK0 public branchA 284 | o 11:a6836f5ce4fe c_aK0 public double//slash
285 | | 285 | |
286 | o 5:0db08e758601 c_aE0 public branchA 286 | o 5:ffb83c22f2ce c_aE0 public double//slash
287 |/ 287 |/
288 o 0:ea207398892e ROOT public default 288 o 0:ea207398892e ROOT public default
289 289
290 $ hg tgl 'all()' -R ../bare-branch-server 290 $ hg tgl 'all()' -R ../bare-branch-server
291 o 12:a6f9f8c6c6cc c_dL0 public default 291 o 12:a6f9f8c6c6cc c_dL0 public default
306 | | 306 | |
307 | o 2:286d02a6e2a2 c_dB0 public default 307 | o 2:286d02a6e2a2 c_dB0 public default
308 |/ 308 |/
309 @ 1:134bc3852ad2 c_dA0 public default 309 @ 1:134bc3852ad2 c_dA0 public default
310 | 310 |
311 | o 11:b0a00ebdfd24 c_aK0 public branchA 311 | o 11:a6836f5ce4fe c_aK0 public double//slash
312 | | 312 | |
313 | o 5:0db08e758601 c_aE0 public branchA 313 | o 5:ffb83c22f2ce c_aE0 public double//slash
314 |/ 314 |/
315 o 0:ea207398892e ROOT public default 315 o 0:ea207398892e ROOT public default
316 316
317 317
318 Checking the option to prevent publishing 318 Checking the option to prevent publishing
343 [255] 343 [255]
344 344
345 Checking the option to prevent automatic publishing 345 Checking the option to prevent automatic publishing
346 =================================================== 346 ===================================================
347 347
348 $ hg up branchA 348 $ hg up double//slash//
349 2 files updated, 0 files merged, 5 files removed, 0 files unresolved 349 2 files updated, 0 files merged, 5 files removed, 0 files unresolved
350 350
351 Making sure the topic-publishing mode is announced as a capability 351 Making sure the topic-publishing mode is announced as a capability
352 352
353 $ hg debugcapabilities $TESTTMP/bare-branch-server | grep topics 353 $ hg debugcapabilities $TESTTMP/bare-branch-server | grep topics
354 ext-topics-publish=auto 354 ext-topics-publish=auto
355 topics 355 topics
356 topics-namespaces
356 $ hg debugcapabilities ssh://user@dummy/bare-branch-server | grep topics 357 $ hg debugcapabilities ssh://user@dummy/bare-branch-server | grep topics
357 _exttopics_heads 358 _exttopics_heads
358 ext-topics-publish=auto 359 ext-topics-publish=auto
359 topics 360 topics
361 topics-namespaces
360 $ hg serve -R ../bare-branch-server -p $HGPORT -d --pid-file hg.pid 362 $ hg serve -R ../bare-branch-server -p $HGPORT -d --pid-file hg.pid
361 $ cat hg.pid >> $DAEMON_PIDS 363 $ cat hg.pid >> $DAEMON_PIDS
362 $ hg debugcapabilities http://localhost:$HGPORT | grep topics 364 $ hg debugcapabilities http://localhost:$HGPORT | grep topics
363 _exttopics_heads 365 _exttopics_heads
364 ext-topics-publish=auto 366 ext-topics-publish=auto
365 topics 367 topics
368 topics-namespaces
366 $ killdaemons.py 369 $ killdaemons.py
367 370
368 Trying to push changeset without topic (would publish them) 371 Trying to push changeset without topic (would publish them)
369 372
370 $ mkcommit c_aM0 --secret 373 $ mkcommit c_aM0 --secret