diff tests/test-topic-issue6406.t @ 6655:81fe0a498447 stable

topic: internal config option to fix hg pick behavior (issue6406)

After some consideration, hg pick was made to always use current topic (and
topic namespace), even if it's not set, in which case the resulting changeset
will not have any topic.

Previously the intended behavior was to only update topic if there was an
active topic, and not touch commit extras at all otherwise. That wasn't ideal,
since pick doesn't change active topic, and amending the just-picked commit
would unset its topic without clear user's intent to do so and to their
surprise.

--- a/tests/test-topic-issue6406.t	Wed Dec 13 15:44:30 2023 -0300
+++ b/tests/test-topic-issue6406.t	Sat Jan 27 17:36:39 2024 -0300
@@ -54,7 +54,8 @@
 This is what the help text says about this issue
 
   $ hg help pick | grep 'active topic'
-      If there is an active topic, it will be used for the resulting changeset.
+      The resulting changeset will have the current active topic. If there's no
+      active topic set, the resulting changeset will also not have any topic.
 
 wdir has no active topic: pick should clear topic of the resulting cset
 
@@ -64,8 +65,7 @@
   picking 2:fcda3d8dafd2 "banana"
   1 new orphan changesets
   $ hg log -r . -T '{rev}: {desc} ({fqbn})\n'
-  4: banana (default//bbb/b-things) (known-bad-output !)
-  4: banana (default) (missing-correct-output !)
+  4: banana (default)
   $ hg debug-topic-namespace
   none
   $ hg topic --current
@@ -80,26 +80,21 @@
   marked working directory as topic: all-things
   $ hg pick 'desc("blackberry")'
   picking 3:48bbfbece8fa "blackberry"
-  active topic 'all-things' grew its first changeset (missing-correct-output !)
-  (see 'hg help topics' for more information) (missing-correct-output !)
+  active topic 'all-things' grew its first changeset
+  (see 'hg help topics' for more information)
   $ hg log -r . -T '{rev}: {desc} ({fqbn})\n'
-  5: blackberry (default//bbb/b-things) (known-bad-output !)
-  5: blackberry (default//everything/all-things) (missing-correct-output !)
+  5: blackberry (default//everything/all-things)
   $ hg debug-topic-namespace
   everything
   $ hg topic --current
   all-things
 
   $ hg log -GT '{rev}: {desc} ({fqbn})\n{join(extras, " ")}\n\n'
-  @  5: blackberry (default//bbb/b-things) (known-bad-output !)
-  |  branch=default topic=b-things topic-namespace=bbb (known-bad-output !)
-  @  5: blackberry (default//everything/all-things) (missing-correct-output !)
-  |  branch=default topic=all-things topic-namespace=everything (missing-correct-output !)
+  @  5: blackberry (default//everything/all-things)
+  |  branch=default topic=all-things topic-namespace=everything
   |
-  o  4: banana (default//bbb/b-things) (known-bad-output !)
-  |  branch=default topic=b-things topic-namespace=bbb (known-bad-output !)
-  o  4: banana (default) (missing-correct-output !)
-  |  branch=default (missing-correct-output !)
+  o  4: banana (default)
+  |  branch=default
   |
   o  1: apple (default//aaa/a-things)
   |  branch=default topic=a-things topic-namespace=aaa