Mercurial > evolve

changeset 5922:8bffab1e7c4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: make two almost identical messages actually identical
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 17 May 2021 19:11:06 +0800
parents c04c4383f33e
children 4c7e430c3e38
files hgext3rd/topic/__init__.py tests/test-topic-debugcb.t
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py	Mon May 17 19:10:22 2021 +0800
+++ b/hgext3rd/topic/__init__.py	Mon May 17 19:11:06 2021 +0800
@@ -958,8 +958,8 @@
 
             revnum = repo[node].rev()
             if len(nodetobook[node]) > 1:
-                ui.status(_(b"skipping revision '%d' as it has multiple bookmarks "
-                          b"on it\n") % revnum)
+                ui.status(_(b"skipping revision %d as it has multiple "
+                            b"bookmarks on it\n") % revnum)
                 return
             targetrevs = _findconvertbmarktopic(repo, bookmark)
             if targetrevs:
@@ -971,8 +971,8 @@
                 if revnum in skipped:
                     continue
                 if len(nodetobook[revnode]) > 1:
-                    ui.status(_(b"skipping '%d' as it has multiple bookmarks on"
-                              b" it\n") % revnum)
+                    ui.status(_(b"skipping revision %d as it has multiple "
+                                b"bookmarks on it\n") % revnum)
                     skipped.append(revnum)
                     continue
                 if bmark == b'@':
--- a/tests/test-topic-debugcb.t	Mon May 17 19:10:22 2021 +0800
+++ b/tests/test-topic-debugcb.t	Mon May 17 19:11:06 2021 +0800
@@ -132,7 +132,7 @@
   o  [0:249055fcca50] root
   
   $ hg debugconvertbookmark --all
-  skipping '9' as it has multiple bookmarks on it
+  skipping revision 9 as it has multiple bookmarks on it
   $ hg log -G
   @  [9:4ad3e7d421d4] Trying multiple bookmarks
   |    bookmark: book1