Mercurial > hg-stable
changeset 20232:5fe4c1a9dc34
commands.bookmarks: hold wlock for write operations
Any invocations of bookmarks other than a plain 'hg bookmarks' will likely
cause a write to the bookmark store. These should be guarded by the wlock.
The repo._bookmarks read should be similarly guarded by the wlock if we're
going to be subsequently writing to it.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 19 Nov 2013 12:33:14 -0800 |
| parents | 1053f5a7bbc6 |
| children | 410193f11422 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 59 insertions(+), 53 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Nov 19 11:47:30 2013 -0800 +++ b/mercurial/commands.py Tue Nov 19 12:33:14 2013 -0800 @@ -808,7 +808,6 @@ inactive = opts.get('inactive') hexfn = ui.debugflag and hex or short - marks = repo._bookmarks cur = repo.changectx('.').node() def checkformat(mark): @@ -862,59 +861,66 @@ if not names and (delete or rev): raise util.Abort(_("bookmark name required")) - if delete: - for mark in names: - if mark not in marks: - raise util.Abort(_("bookmark '%s' does not exist") % mark) - if mark == repo._bookmarkcurrent: - bookmarks.unsetcurrent(repo) - del marks[mark] - marks.write() - - elif rename: - if not names: - raise util.Abort(_("new bookmark name required")) - elif len(names) > 1: - raise util.Abort(_("only one new bookmark name allowed")) - mark = checkformat(names[0]) - if rename not in marks: - raise util.Abort(_("bookmark '%s' does not exist") % rename) - checkconflict(repo, mark, force) - marks[mark] = marks[rename] - if repo._bookmarkcurrent == rename and not inactive: - bookmarks.setcurrent(repo, mark) - del marks[rename] - marks.write() - - elif names: - newact = None - for mark in names: - mark = checkformat(mark) - if newact is None: - newact = mark - if inactive and mark == repo._bookmarkcurrent: - bookmarks.unsetcurrent(repo) - return - tgt = cur - if rev: - tgt = scmutil.revsingle(repo, rev).node() - checkconflict(repo, mark, force, tgt) - marks[mark] = tgt - if not inactive and cur == marks[newact] and not rev: - bookmarks.setcurrent(repo, newact) - elif cur != tgt and newact == repo._bookmarkcurrent: - bookmarks.unsetcurrent(repo) - marks.write() - - elif inactive: - if len(marks) == 0: - ui.status(_("no bookmarks set\n")) - elif not repo._bookmarkcurrent: - ui.status(_("no active bookmark\n")) - else: - bookmarks.unsetcurrent(repo) - + if delete or rename or names or inactive: + wlock = repo.wlock() + try: + marks = repo._bookmarks + if delete: + for mark in names: + if mark not in marks: + raise util.Abort(_("bookmark '%s' does not exist") % + mark) + if mark == repo._bookmarkcurrent: + bookmarks.unsetcurrent(repo) + del marks[mark] + marks.write() + + elif rename: + if not names: + raise util.Abort(_("new bookmark name required")) + elif len(names) > 1: + raise util.Abort(_("only one new bookmark name allowed")) + mark = checkformat(names[0]) + if rename not in marks: + raise util.Abort(_("bookmark '%s' does not exist") % rename) + checkconflict(repo, mark, force) + marks[mark] = marks[rename] + if repo._bookmarkcurrent == rename and not inactive: + bookmarks.setcurrent(repo, mark) + del marks[rename] + marks.write() + + elif names: + newact = None + for mark in names: + mark = checkformat(mark) + if newact is None: + newact = mark + if inactive and mark == repo._bookmarkcurrent: + bookmarks.unsetcurrent(repo) + return + tgt = cur + if rev: + tgt = scmutil.revsingle(repo, rev).node() + checkconflict(repo, mark, force, tgt) + marks[mark] = tgt + if not inactive and cur == marks[newact] and not rev: + bookmarks.setcurrent(repo, newact) + elif cur != tgt and newact == repo._bookmarkcurrent: + bookmarks.unsetcurrent(repo) + marks.write() + + elif inactive: + if len(marks) == 0: + ui.status(_("no bookmarks set\n")) + elif not repo._bookmarkcurrent: + ui.status(_("no active bookmark\n")) + else: + bookmarks.unsetcurrent(repo) + finally: + wlock.release() else: # show bookmarks + marks = repo._bookmarks if len(marks) == 0: ui.status(_("no bookmarks set\n")) else: