This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8124

bookmarks: avoid traceback when two pushes race to delete the same bookmark
ClosedPublic

Authored by valentin.gatienbaron on Feb 15 2020, 4:05 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGedaae3616ba3: bookmarks: avoid traceback when two pushes race to delete the same bookmark
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/bookmarks.py (2 lines)
Mrelnotes/next (1 line)

Diff 20270

mercurial/bookmarks.py

nrefs = self._nodemap.get(node) nrefs = self._nodemap.get(node)
if nrefs is None: if nrefs is None:
self._nodemap[node] = [mark] self._nodemap[node] = [mark]
else: else:
nrefs.append(mark) nrefs.append(mark)
nrefs.sort() nrefs.sort()
def _del(self, mark): def _del(self, mark):
if mark not in self._refmap:
return
self._clean = False self._clean = False
node = self._refmap.pop(mark) node = self._refmap.pop(mark)
nrefs = self._nodemap[node] nrefs = self._nodemap[node]
if len(nrefs) == 1: if len(nrefs) == 1:
assert nrefs[0] == mark assert nrefs[0] == mark
del self._nodemap[node] del self._nodemap[node]
else: else:
nrefs.remove(mark) nrefs.remove(mark)

relnotes/next

`cp` as copied). `cp` as copied).
* Use `hg copy --forget --at-rev REV` to unmark already committed * Use `hg copy --forget --at-rev REV` to unmark already committed
copies. copies.
== Bug Fixes == == Bug Fixes ==
* Fix server exception when concurrent pushes delete the same bookmark
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
* When `hg rebase` pauses for merge conflict resolution, the working * When `hg rebase` pauses for merge conflict resolution, the working
copy will no longer have the rebased node as a second parent. You copy will no longer have the rebased node as a second parent. You
can use the new `conflictparents()` revset for finding the other can use the new `conflictparents()` revset for finding the other
parent during a conflict. parent during a conflict.