Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: drop trailing "!" for some errors about bookmarks
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 23 Nov 2020 14:48:05 -0800
changeset 45910 f0626acf007d
parent 45909 ca39c45014fa
child 45911 8939062597f0
errors: drop trailing "!" for some errors about bookmarks Differential Revision: https://phab.mercurial-scm.org/D9382
mercurial/exchange.py file | annotate | diff | comparison | revisions
tests/test-bookmarks-pushpull.t file | annotate | diff | comparison | revisions 
--- a/mercurial/exchange.py	Mon Nov 23 12:47:08 2020 -0800
+++ b/mercurial/exchange.py	Mon Nov 23 14:48:05 2020 -0800
@@ -355,15 +355,15 @@
 bookmsgmap = {
     b'update': (
         _(b"updating bookmark %s\n"),
-        _(b'updating bookmark %s failed!\n'),
+        _(b'updating bookmark %s failed\n'),
     ),
     b'export': (
         _(b"exporting bookmark %s\n"),
-        _(b'exporting bookmark %s failed!\n'),
+        _(b'exporting bookmark %s failed\n'),
     ),
     b'delete': (
         _(b"deleting remote bookmark %s\n"),
-        _(b'deleting remote bookmark %s failed!\n'),
+        _(b'deleting remote bookmark %s failed\n'),
     ),
 }
 
--- a/tests/test-bookmarks-pushpull.t	Mon Nov 23 12:47:08 2020 -0800
+++ b/tests/test-bookmarks-pushpull.t	Mon Nov 23 14:48:05 2020 -0800
@@ -1166,7 +1166,7 @@
   searching for changes
   no changes found
   pushkey-abort: prepushkey hook exited with status 1
-  abort: exporting bookmark @ failed!
+  abort: exporting bookmark @ failed
   [255]
 
 #endif
@@ -1194,7 +1194,7 @@
   searching for changes
   no changes found
   remote: pushkey-abort: prepushkey hook exited with status 1
-  abort: exporting bookmark @ failed!
+  abort: exporting bookmark @ failed
   [255]
 
   $ hg -R ../issue4455-dest/ bookmarks
@@ -1205,7 +1205,7 @@
   searching for changes
   no changes found
   remote: pushkey-abort: prepushkey hook exited with status 1
-  exporting bookmark @ failed!
+  exporting bookmark @ failed
   [1]
 
 #endif
@@ -1233,7 +1233,7 @@
   searching for changes
   no changes found
   remote: pushkey-abort: prepushkey hook exited with status 1
-  abort: exporting bookmark @ failed!
+  abort: exporting bookmark @ failed
   [255]
 
   $ hg -R ../issue4455-dest/ bookmarks
@@ -1244,7 +1244,7 @@
   searching for changes
   no changes found
   remote: pushkey-abort: prepushkey hook exited with status 1
-  exporting bookmark @ failed!
+  exporting bookmark @ failed
   [1]
 
 #endif
@@ -1324,7 +1324,7 @@
   searching for changes
   no changes found
   remote: pushkey-abort: prepushkey.no-bm-move hook exited with status 1
-  abort: updating bookmark foo failed!
+  abort: updating bookmark foo failed
   [255]
 #endif
 #if b2-binary
mercurial