diff tests/test-topic.t @ 6395:1328195f76a9 mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 06 Feb 2023 19:49:33 +0400
parents 171d13d8f0ce faea18a26188
children 270223576b7f a62308fb15c1
line wrap: on
line diff
--- a/tests/test-topic.t	Thu Dec 08 20:23:47 2022 +0400
+++ b/tests/test-topic.t	Mon Feb 06 19:49:33 2023 +0400
@@ -261,6 +261,9 @@
   $ hg topics --clear somerandomtopic
   abort: cannot use --clear when setting a topic
   [255]
+  $ hg topics --list --clear
+  abort: cannot specify both --list and --clear
+  [255]
 
 Trying some invalid topicnames
 
@@ -277,7 +280,7 @@
   abort: cannot use an integer as a name
   [255]
   $ hg topic '   '
-  abort: topic name cannot consist entirely of whitespaces
+  abort: topic names cannot consist entirely of whitespace
   [255]
 
   $ hg topic 'a12#45'
@@ -317,6 +320,24 @@
   $ hg topic
    * topicflag (0 changesets)
 
+Non-ascii topic name
+
+  $ hg --encoding utf-8 topic æ
+  $ hg topics
+   * \xc3\xa6 (0 changesets) (esc)
+  $ hg --encoding latin1 topics
+   * \xc3\xa6 (0 changesets) (esc)
+
+  $ hg --encoding utf-8 topic ©
+  abort: invalid topic name: '\xc2\xa9' (esc)
+  (topic names can only consist of alphanumeric, '-' '_' and '.' characters)
+  [255]
+
+  $ hg --encoding latin1 topic æ
+  abort: invalid topic name: '\xc3\xa6' (esc)
+  (topic names can only consist of alphanumeric, '-' '_' and '.' characters)
+  [255]
+
 Make a topic
 
   $ hg topic narf
@@ -581,11 +602,11 @@
      fran  (1 changesets)
    * narf  (2 changesets)
      query (2 changesets)
-  $ hg debugnamecomplete # branch:topic here is a buggy side effect
+  $ hg debugnamecomplete
   default
-  default:fran
-  default:narf
-  default:query
+  default//fran
+  default//narf
+  default//query
   fran
   narf
   query