# HG changeset patch # User Anton Shestakov # Date 1656342145 -14400 # Node ID 1eb543272657baf0e124db38ce4940677a6bfd90 # Parent 213db29a19e998c3628174b2ba7a931dd863a2fd topic: switch to the short fqbn format by default diff -r 213db29a19e9 -r 1eb543272657 hgext3rd/topic/common.py --- a/hgext3rd/topic/common.py Tue May 31 12:14:51 2022 +0400 +++ b/hgext3rd/topic/common.py Mon Jun 27 19:02:25 2022 +0400 @@ -42,7 +42,7 @@ tns, topic = b'default', tns return branch, tns, topic -def formatfqbn(branch=b'', namespace=b'', topic=b'', short=False): +def formatfqbn(branch=b'', namespace=b'', topic=b'', short=True): """format branch, namespace and topic into branch//namespace/topic string >>> formatfqbn(branch=b'branch', topic=b'topic') diff -r 213db29a19e9 -r 1eb543272657 tests/test-namespaces.t --- a/tests/test-namespaces.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-namespaces.t Mon Jun 27 19:02:25 2022 +0400 @@ -111,17 +111,17 @@ default values - $ hg debug-format-fqbn -b default -n default -t '' + $ hg debug-format-fqbn -b default -n default -t '' --no-short default//default/ $ hg debug-format-fqbn -b default -n default -t '' --short default - $ hg debug-format-fqbn -b default -n namespace -t '' + $ hg debug-format-fqbn -b default -n namespace -t '' --no-short default//namespace/ $ hg debug-format-fqbn -b default -n namespace -t '' --short default//namespace/ - $ hg debug-format-fqbn -b default -n default -t topic + $ hg debug-format-fqbn -b default -n default -t topic --no-short default//default/topic $ hg debug-format-fqbn -b default -n default -t topic --short default//topic diff -r 213db29a19e9 -r 1eb543272657 tests/test-push-checkheads-mixed-branch-topic-G1.t --- a/tests/test-push-checkheads-mixed-branch-topic-G1.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-push-checkheads-mixed-branch-topic-G1.t Mon Jun 27 19:02:25 2022 +0400 @@ -67,9 +67,9 @@ 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden - @ 845eeb768064 [default//default/Z] (draft): B1 + @ 845eeb768064 [default//Z] (draft): B1 | - | x 35d2f30a8ba4 [default//default/Z] (draft): B0 + | x 35d2f30a8ba4 [default//Z] (draft): B0 | | | o 8aaa48160adc [default] (draft): A0 |/ diff -r 213db29a19e9 -r 1eb543272657 tests/test-push-checkheads-mixed-branch-topic-G2.t --- a/tests/test-push-checkheads-mixed-branch-topic-G2.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-push-checkheads-mixed-branch-topic-G2.t Mon Jun 27 19:02:25 2022 +0400 @@ -84,7 +84,7 @@ | | x 44759c6d327d [default] (draft): C0 | | - | * 35d2f30a8ba4 [default//default/Z] (draft): B0 + | * 35d2f30a8ba4 [default//Z] (draft): B0 | | | x 8aaa48160adc [default] (draft): A0 |/ diff -r 213db29a19e9 -r 1eb543272657 tests/test-push-checkheads-mixed-branch-topic-G3.t --- a/tests/test-push-checkheads-mixed-branch-topic-G3.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-push-checkheads-mixed-branch-topic-G3.t Mon Jun 27 19:02:25 2022 +0400 @@ -77,7 +77,7 @@ | | x 44759c6d327d [default] (draft): C0 | | - | o 35d2f30a8ba4 [default//default/Z] (draft): B0 + | o 35d2f30a8ba4 [default//Z] (draft): B0 | | | o 8aaa48160adc [default] (draft): A0 |/ diff -r 213db29a19e9 -r 1eb543272657 tests/test-push-checkheads-multi-topics-F1.t --- a/tests/test-push-checkheads-multi-topics-F1.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-push-checkheads-multi-topics-F1.t Mon Jun 27 19:02:25 2022 +0400 @@ -71,11 +71,11 @@ 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden - @ 845eeb768064 [default//default/Z] (draft): B1 + @ 845eeb768064 [default//Z] (draft): B1 | - | x e1494106e1ca [default//default/Z] (draft): B0 + | x e1494106e1ca [default//Z] (draft): B0 | | - | o f5cd873e2965 [default//default/Y] (draft): A0 + | o f5cd873e2965 [default//Y] (draft): A0 |/ | x 8aaa48160adc [default] (draft): A0 |/ diff -r 213db29a19e9 -r 1eb543272657 tests/test-push-checkheads-multi-topics-F2.t --- a/tests/test-push-checkheads-multi-topics-F2.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-push-checkheads-multi-topics-F2.t Mon Jun 27 19:02:25 2022 +0400 @@ -82,15 +82,15 @@ 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden - @ 0e26ba57d799 [default//default/Y] (draft): C1 + @ 0e26ba57d799 [default//Y] (draft): C1 | - o fb4a34222909 [default//default/Y] (draft): A1 + o fb4a34222909 [default//Y] (draft): A1 | - | x 345721b128e8 [default//default/Y] (draft): C0 + | x 345721b128e8 [default//Y] (draft): C0 | | - | * e1494106e1ca [default//default/Z] (draft): B0 + | * e1494106e1ca [default//Z] (draft): B0 | | - | x f5cd873e2965 [default//default/Y] (draft): A0 + | x f5cd873e2965 [default//Y] (draft): A0 |/ o 1e4be0697311 [default] (public): root diff -r 213db29a19e9 -r 1eb543272657 tests/test-push-checkheads-multi-topics-F3.t --- a/tests/test-push-checkheads-multi-topics-F3.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-push-checkheads-multi-topics-F3.t Mon Jun 27 19:02:25 2022 +0400 @@ -77,13 +77,13 @@ 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden - @ 57530ca5eb24 [default//default/Y] (draft): C1 + @ 57530ca5eb24 [default//Y] (draft): C1 | - | x 345721b128e8 [default//default/Y] (draft): C0 + | x 345721b128e8 [default//Y] (draft): C0 | | - | o e1494106e1ca [default//default/Z] (draft): B0 + | o e1494106e1ca [default//Z] (draft): B0 | | - | o f5cd873e2965 [default//default/Y] (draft): A0 + | o f5cd873e2965 [default//Y] (draft): A0 |/ o 1e4be0697311 [default] (public): root diff -r 213db29a19e9 -r 1eb543272657 tests/test-single-head-obsolescence-topic-B1.t --- a/tests/test-single-head-obsolescence-topic-B1.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-single-head-obsolescence-topic-B1.t Mon Jun 27 19:02:25 2022 +0400 @@ -84,17 +84,17 @@ 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden - @ f4ed6717fb66 [default//default/topic-X] (draft): B1 + @ f4ed6717fb66 [default//topic-X] (draft): B1 | - o c1340bef453e [default//default/topic-X] (draft): A1 + o c1340bef453e [default//topic-X] (draft): A1 | - | * 618812b710f7 [default//default/topic-Y] (draft): D0 + | * 618812b710f7 [default//topic-Y] (draft): D0 | | - | * d1ad53773db2 [default//default/topic-Y] (draft): C0 + | * d1ad53773db2 [default//topic-Y] (draft): C0 | | - | x 1c1f62b56685 [default//default/topic-X] (draft): B0 + | x 1c1f62b56685 [default//topic-X] (draft): B0 | | - | x 5a47a98cd8e5 [default//default/topic-X] (draft): A0 + | x 5a47a98cd8e5 [default//topic-X] (draft): A0 |/ o 1e4be0697311 [default] (public): root diff -r 213db29a19e9 -r 1eb543272657 tests/test-single-head-obsolescence-topic-B2.t --- a/tests/test-single-head-obsolescence-topic-B2.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-single-head-obsolescence-topic-B2.t Mon Jun 27 19:02:25 2022 +0400 @@ -83,15 +83,15 @@ obsoleted 1 changesets 2 new orphan changesets $ hg log -G --hidden - @ 5a4735b75167 [default//default/topic-X] (draft): B1 + @ 5a4735b75167 [default//topic-X] (draft): B1 | - | * 02490b2dd1c5 [Z//default/topic-Y] (draft): D0 + | * 02490b2dd1c5 [Z//topic-Y] (draft): D0 | | - | * 447ad8382abc [Z//default/topic-Y] (draft): C0 + | * 447ad8382abc [Z//topic-Y] (draft): C0 | | - | x 1c1f62b56685 [default//default/topic-X] (draft): B0 + | x 1c1f62b56685 [default//topic-X] (draft): B0 | | - | o 5a47a98cd8e5 [default//default/topic-X] (draft): A0 + | o 5a47a98cd8e5 [default//topic-X] (draft): A0 |/ o 1e4be0697311 [default] (public): root diff -r 213db29a19e9 -r 1eb543272657 tests/test-single-head-obsolescence-topic-B3.t --- a/tests/test-single-head-obsolescence-topic-B3.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-single-head-obsolescence-topic-B3.t Mon Jun 27 19:02:25 2022 +0400 @@ -86,17 +86,17 @@ 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden - @ 9f6e6381b9aa [default//default/topic-X] (draft): C1 + @ 9f6e6381b9aa [default//topic-X] (draft): C1 | - o c1340bef453e [default//default/topic-X] (draft): A1 + o c1340bef453e [default//topic-X] (draft): A1 | - | * 850d57e10bfe [default//default/topic-Y] (draft): D0 + | * 850d57e10bfe [default//topic-Y] (draft): D0 | | - | x fcdd583577e8 [default//default/topic-X] (draft): C0 + | x fcdd583577e8 [default//topic-X] (draft): C0 | | - | * 030eec7a0fe2 [default//default/topic-Y] (draft): B0 + | * 030eec7a0fe2 [default//topic-Y] (draft): B0 | | - | x 5a47a98cd8e5 [default//default/topic-X] (draft): A0 + | x 5a47a98cd8e5 [default//topic-X] (draft): A0 |/ o 1e4be0697311 [default] (public): root diff -r 213db29a19e9 -r 1eb543272657 tests/test-single-head-obsolescence-topic-B4.t --- a/tests/test-single-head-obsolescence-topic-B4.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-single-head-obsolescence-topic-B4.t Mon Jun 27 19:02:25 2022 +0400 @@ -83,15 +83,15 @@ obsoleted 1 changesets 1 new orphan changesets $ hg log -G --hidden - @ b98a8bd4ca39 [default//default/topic-X] (draft): C1 + @ b98a8bd4ca39 [default//topic-X] (draft): C1 | - | * 850d57e10bfe [default//default/topic-Y] (draft): D0 + | * 850d57e10bfe [default//topic-Y] (draft): D0 | | - | x fcdd583577e8 [default//default/topic-X] (draft): C0 + | x fcdd583577e8 [default//topic-X] (draft): C0 | | - | o 030eec7a0fe2 [default//default/topic-Y] (draft): B0 + | o 030eec7a0fe2 [default//topic-Y] (draft): B0 |/ - o 5a47a98cd8e5 [default//default/topic-X] (draft): A0 + o 5a47a98cd8e5 [default//topic-X] (draft): A0 | o 1e4be0697311 [default] (public): root diff -r 213db29a19e9 -r 1eb543272657 tests/test-single-head-obsolescence-topic-B5.t --- a/tests/test-single-head-obsolescence-topic-B5.t Tue May 31 12:14:51 2022 +0400 +++ b/tests/test-single-head-obsolescence-topic-B5.t Mon Jun 27 19:02:25 2022 +0400 @@ -88,13 +88,13 @@ | o f6082bc4ffef [default] (draft): A1 | - | * 339fd31549ed [default//default/topic-Y] (draft): C0 + | * 339fd31549ed [default//topic-Y] (draft): C0 | | - | x 33b3d4185449 [default//default/topic-X] (draft): M0 + | x 33b3d4185449 [default//topic-X] (draft): M0 | |\ - +---o d3826ff42cf7 [default//default/topic-X] (draft): B0 + +---o d3826ff42cf7 [default//topic-X] (draft): B0 | | - | o 5a47a98cd8e5 [default//default/topic-X] (draft): A0 + | o 5a47a98cd8e5 [default//topic-X] (draft): A0 |/ o 1e4be0697311 [default] (public): root