Mercurial > public > mercurial-scm > hg
view mercurial/utils/hashutil.py @ 44370:edaae3616ba3
bookmarks: avoid traceback when two pushes race to delete the same bookmark
`hg push -f -B remote-only-bookmark` can raise server-side in
`bookmarks._del` (specifically in `self._refmap.pop(mark)`), if the
remote-only bookmark got deleted concurrently.
Fix this by simply not deleting the non-existent bookmark in that
case.
For avoidance of doubt, refusing to delete a bookmark that doesn't
exist when the push starts is taking care of elsewhere; no change of
behavior there.
Differential Revision: https://phab.mercurial-scm.org/D8124
author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
---|---|
date | Sat, 15 Feb 2020 14:51:33 -0500 |
parents | 7126d8b8e0e6 |
children | 521ac0d7047f |
line wrap: on
line source
from __future__ import absolute_import import hashlib try: from ..thirdparty import sha1dc sha1 = sha1dc.sha1 except (ImportError, AttributeError): sha1 = hashlib.sha1