comparison tests/test-topic-change.t @ 6032:2800aa3c3dbf

topic: drop the old workaround for detecting amends by amend_source We don't need to have this workaround because amends are handled differently now. See previous commits, where the old code for handling amends in topic extension gets removed. Various commits now preserve amend_source when going through the _changetopics function (used when changing a topic via the hg topics command).
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 30 Aug 2021 12:05:14 +0300
parents c3d66af4cb07
children c0921b5277a0 2fbe91d762ef
comparison
equal deleted inserted replaced
6031:c3d66af4cb07 6032:2800aa3c3dbf
301 clearing empty topic "watwat" 301 clearing empty topic "watwat"
302 active topic 'watwat' is now empty 302 active topic 'watwat' is now empty
303 cleared topic on 1 changesets 303 cleared topic on 1 changesets
304 304
305 $ hg log -r . -T '{rev}: {join(extras, " ")}\n' 305 $ hg log -r . -T '{rev}: {join(extras, " ")}\n'
306 31: _rewrite_noise=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ (re) 306 31: _rewrite_noise=[0-9a-f]+ amend_source=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ (re)
307 $ hg glog 307 $ hg glog
308 @ 31:c48d6d71b2d9 {} 308 @ 31:fb090538b75b {}
309 | Added h (book) 309 | Added h (book)
310 | 310 |
311 o 26:7c76c271395f {bar} 311 o 26:7c76c271395f {bar}
312 | Added g () 312 | Added g ()
313 | 313 |
335 $ hg bookmark bookboo 335 $ hg bookmark bookboo
336 $ hg topic -r . movebook 336 $ hg topic -r . movebook
337 switching to topic movebook 337 switching to topic movebook
338 changed topic on 1 changesets to "movebook" 338 changed topic on 1 changesets to "movebook"
339 $ hg log -r . -T '{rev}: {join(extras, " ")}\n' 339 $ hg log -r . -T '{rev}: {join(extras, " ")}\n'
340 32: _rewrite_noise=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ topic=movebook (re) 340 32: _rewrite_noise=[0-9a-f]+ amend_source=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ topic=movebook (re)
341 $ hg glog 341 $ hg glog
342 @ 32:1b83d11095b9 {movebook} 342 @ 32:3955a85a6349 {movebook}
343 | Added h (book bookboo) 343 | Added h (book bookboo)
344 | 344 |
345 o 26:7c76c271395f {bar} 345 o 26:7c76c271395f {bar}
346 | Added g () 346 | Added g ()
347 | 347 |
382 382
383 $ hg glog 383 $ hg glog
384 @ 33:894983f69e69 {watwat} 384 @ 33:894983f69e69 {watwat}
385 | Added g () 385 | Added g ()
386 | 386 |
387 | * 32:1b83d11095b9 {movebook} 387 | * 32:3955a85a6349 {movebook}
388 | | Added h (book bookboo) 388 | | Added h (book bookboo)
389 | | 389 | |
390 | x 26:7c76c271395f {bar} 390 | x 26:7c76c271395f {bar}
391 |/ Added g () 391 |/ Added g ()
392 | 392 |