martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9382 AFFECTED FILES mercurial/exchange.py tests/test-bookmarks-pushpull.t CHANGE DETAILS diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t --- a/tests/test-bookmarks-pushpull.t +++ b/tests/test-bookmarks-pushpull.t @@ -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 diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -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'), ), } To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
