This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9382

errors: drop trailing "!" for some errors about bookmarks
ClosedPublic

Authored by martinvonz on Nov 23 2020, 6:30 PM.

Details

Reviewers
Alphare
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGf0626acf007d: errors: drop trailing "!" for some errors about bookmarks

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Nov 23 2020, 6:30 PM
Alphare accepted this revision.Nov 24 2020, 5:58 AM
mharbison72 accepted this revision.Nov 25 2020, 1:34 AM
This revision is now accepted and ready to land.Nov 25 2020, 1:34 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (6 lines)
Mtests/test-bookmarks-pushpull.t (12 lines)

Diff 23639

mercurial/exchange.py

else: else:
return self.fallbackheads return self.fallbackheads
# mapping of message used when pushing bookmark # mapping of message used when pushing bookmark
bookmsgmap = { bookmsgmap = {
b'update': ( b'update': (
_(b"updating bookmark %s\n"), _(b"updating bookmark %s\n"),
_(b'updating bookmark %s failed!\n'), _(b'updating bookmark %s failed\n'),
), ),
b'export': ( b'export': (
_(b"exporting bookmark %s\n"), _(b"exporting bookmark %s\n"),
_(b'exporting bookmark %s failed!\n'), _(b'exporting bookmark %s failed\n'),
), ),
b'delete': ( b'delete': (
_(b"deleting remote bookmark %s\n"), _(b"deleting remote bookmark %s\n"),
_(b'deleting remote bookmark %s failed!\n'), _(b'deleting remote bookmark %s failed\n'),
), ),
} }
def push( def push(
repo, repo,
remote, remote,
force=False, force=False,

tests/test-bookmarks-pushpull.t

#if b2-pushkey #if b2-pushkey
$ hg push -B @ local $ hg push -B @ local
pushing to $TESTTMP/issue4455-dest pushing to $TESTTMP/issue4455-dest
searching for changes searching for changes
no changes found no changes found
pushkey-abort: prepushkey hook exited with status 1 pushkey-abort: prepushkey hook exited with status 1
abort: exporting bookmark @ failed! abort: exporting bookmark @ failed
[255] [255]
#endif #endif
#if b2-binary #if b2-binary
$ hg push -B @ local $ hg push -B @ local
pushing to $TESTTMP/issue4455-dest pushing to $TESTTMP/issue4455-dest
searching for changes searching for changes
#if b2-pushkey #if b2-pushkey
$ hg push -B @ ssh # bundle2+ $ hg push -B @ ssh # bundle2+
pushing to ssh://user@dummy/issue4455-dest pushing to ssh://user@dummy/issue4455-dest
searching for changes searching for changes
no changes found no changes found
remote: pushkey-abort: prepushkey hook exited with status 1 remote: pushkey-abort: prepushkey hook exited with status 1
abort: exporting bookmark @ failed! abort: exporting bookmark @ failed
[255] [255]
$ hg -R ../issue4455-dest/ bookmarks $ hg -R ../issue4455-dest/ bookmarks
no bookmarks set no bookmarks set
$ hg push -B @ ssh --config devel.legacy.exchange=bundle1 $ hg push -B @ ssh --config devel.legacy.exchange=bundle1
pushing to ssh://user@dummy/issue4455-dest pushing to ssh://user@dummy/issue4455-dest
searching for changes searching for changes
no changes found no changes found
remote: pushkey-abort: prepushkey hook exited with status 1 remote: pushkey-abort: prepushkey hook exited with status 1
exporting bookmark @ failed! exporting bookmark @ failed
[1] [1]
#endif #endif
#if b2-binary #if b2-binary
$ hg push -B @ ssh # bundle2+ $ hg push -B @ ssh # bundle2+
pushing to ssh://user@dummy/issue4455-dest pushing to ssh://user@dummy/issue4455-dest
searching for changes searching for changes
---------- ----------
#if b2-pushkey #if b2-pushkey
$ hg push -B @ http # bundle2+ $ hg push -B @ http # bundle2+
pushing to http://localhost:$HGPORT/ pushing to http://localhost:$HGPORT/
searching for changes searching for changes
no changes found no changes found
remote: pushkey-abort: prepushkey hook exited with status 1 remote: pushkey-abort: prepushkey hook exited with status 1
abort: exporting bookmark @ failed! abort: exporting bookmark @ failed
[255] [255]
$ hg -R ../issue4455-dest/ bookmarks $ hg -R ../issue4455-dest/ bookmarks
no bookmarks set no bookmarks set
$ hg push -B @ http --config devel.legacy.exchange=bundle1 $ hg push -B @ http --config devel.legacy.exchange=bundle1
pushing to http://localhost:$HGPORT/ pushing to http://localhost:$HGPORT/
searching for changes searching for changes
no changes found no changes found
remote: pushkey-abort: prepushkey hook exited with status 1 remote: pushkey-abort: prepushkey hook exited with status 1
exporting bookmark @ failed! exporting bookmark @ failed
[1] [1]
#endif #endif
#if b2-binary #if b2-binary
$ hg push -B @ ssh # bundle2+ $ hg push -B @ ssh # bundle2+
pushing to ssh://user@dummy/issue4455-dest pushing to ssh://user@dummy/issue4455-dest
moving bookmark 'foo' forward from 79513d0d7716 moving bookmark 'foo' forward from 79513d0d7716
#if b2-pushkey #if b2-pushkey
$ hg -R client push $ hg -R client push
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
no changes found no changes found
remote: pushkey-abort: prepushkey.no-bm-move hook exited with status 1 remote: pushkey-abort: prepushkey.no-bm-move hook exited with status 1
abort: updating bookmark foo failed! abort: updating bookmark foo failed
[255] [255]
#endif #endif
#if b2-binary #if b2-binary
$ hg -R client push $ hg -R client push
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
no changes found no changes found
remote: prepushkey.no-bm-move hook exited with status 1 remote: prepushkey.no-bm-move hook exited with status 1