Mercurial > public > mercurial-scm > hg
diff mercurial/bookmarks.py @ 15908:60cb4f381a78
bookmarks: backout locking change in 12dea4d998ec
Repo lock only applies to data in .hg/store/
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 18 Jan 2012 14:56:52 -0600 |
| parents | 12dea4d998ec |
| children | 894f83a35653 |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Tue Jan 17 20:23:23 2012 +0100 +++ b/mercurial/bookmarks.py Wed Jan 18 14:56:52 2012 -0600 @@ -84,7 +84,7 @@ raise util.Abort(_("bookmark '%s' contains illegal " "character" % mark)) - lock = repo.lock() + wlock = repo.wlock() try: file = repo.opener('bookmarks', 'w', atomictemp=True) @@ -99,7 +99,7 @@ pass finally: - lock.release() + wlock.release() def setcurrent(repo, mark): '''Set the name of the bookmark that we are currently on @@ -117,13 +117,13 @@ raise util.Abort(_("bookmark '%s' contains illegal " "character" % mark)) - lock = repo.lock() + wlock = repo.wlock() try: file = repo.opener('bookmarks.current', 'w', atomictemp=True) file.write(encoding.fromlocal(mark)) file.close() finally: - lock.release() + wlock.release() repo._bookmarkcurrent = mark def updatecurrentbookmark(repo, oldnode, curbranch): @@ -162,7 +162,7 @@ return d def pushbookmark(repo, key, old, new): - lock = repo.lock() + w = repo.wlock() try: marks = repo._bookmarks if hex(marks.get(key, '')) != old: @@ -176,7 +176,7 @@ write(repo) return True finally: - lock.release() + w.release() def updatefromremote(ui, repo, remote, path): ui.debug("checking for updated bookmarks\n")