diff tests/test-topic.t @ 6686:155de3e19adb mercurial-5.7

test-compat: merge mercurial-5.8 into mercurial-5.7

--- a/tests/test-topic.t	Sat Oct 14 13:15:16 2023 -0300
+++ b/tests/test-topic.t	Sun Feb 04 16:28:25 2024 -0300
@@ -285,12 +285,12 @@
 
   $ hg topic 'a12#45'
   abort: invalid topic name: 'a12#45'
-  (topic names can only consist of alphanumeric, '-' '_' and '.' characters)
+  (topic names can only consist of alphanumeric, '-', '_' and '.' characters)
   [10]
 
   $ hg topic 'foo bar'
   abort: invalid topic name: 'foo bar'
-  (topic names can only consist of alphanumeric, '-' '_' and '.' characters)
+  (topic names can only consist of alphanumeric, '-', '_' and '.' characters)
   [10]
 
 this is trying to list topic names
@@ -298,7 +298,7 @@
 
   $ hg topic '*12 B23'
   abort: invalid topic name: '*12 B23'
-  (topic names can only consist of alphanumeric, '-' '_' and '.' characters)
+  (topic names can only consist of alphanumeric, '-', '_' and '.' characters)
   [10]
 
 Test commit flag and help text
@@ -322,20 +322,25 @@
 
 Non-ascii topic name
 
+  $ hg topic --clear
+  clearing empty topic "topicflag"
   $ hg --encoding utf-8 topic æ
-  $ hg topics
-   * \xc3\xa6 (0 changesets) (esc)
+  marked working directory as topic: \xc3\xa6 (esc)
+  $ hg --encoding utf-8 topics
+   * æ (0 changesets) (esc)
+  $ hg --encoding ascii topics
+   * ? (0 changesets) (esc)
   $ hg --encoding latin1 topics
-   * \xc3\xa6 (0 changesets) (esc)
+   * \xe6 (0 changesets) (esc)
 
   $ hg --encoding utf-8 topic ©
   abort: invalid topic name: '\xc2\xa9' (esc)
-  (topic names can only consist of alphanumeric, '-' '_' and '.' characters)
+  (topic names can only consist of alphanumeric, '-', '_' and '.' characters)
   [10]
 
   $ hg --encoding latin1 topic æ
   abort: invalid topic name: '\xc3\xa6' (esc)
-  (topic names can only consist of alphanumeric, '-' '_' and '.' characters)
+  (topic names can only consist of alphanumeric, '-', '_' and '.' characters)
   [10]
 
 Make a topic