diff -r 59e4a7781a36 -r ae79cf6f9c82 mercurial/wireproto.py --- a/mercurial/wireproto.py Tue Feb 06 11:31:25 2018 -0800 +++ b/mercurial/wireproto.py Wed Jan 31 10:06:39 2018 -0800 @@ -914,11 +914,8 @@ proto.redirect() - try: - r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key), - encoding.tolocal(old), new) or False - except error.Abort: - r = False + r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key), + encoding.tolocal(old), new) or False output = proto.restore()