--- a/mercurial/bookmarks.py Fri Jan 13 02:29:38 2012 +0100
+++ b/mercurial/bookmarks.py Fri Jan 13 02:30:43 2012 +0100
@@ -84,7 +84,7 @@
raise util.Abort(_("bookmark '%s' contains illegal "
"character" % mark))
- wlock = repo.wlock()
+ lock = repo.lock()
try:
file = repo.opener('bookmarks', 'w', atomictemp=True)
@@ -99,7 +99,7 @@
pass
finally:
- wlock.release()
+ lock.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))
- wlock = repo.wlock()
+ lock = repo.lock()
try:
file = repo.opener('bookmarks.current', 'w', atomictemp=True)
file.write(encoding.fromlocal(mark))
file.close()
finally:
- wlock.release()
+ lock.release()
repo._bookmarkcurrent = mark
def updatecurrentbookmark(repo, oldnode, curbranch):
@@ -162,7 +162,7 @@
return d
def pushbookmark(repo, key, old, new):
- w = repo.wlock()
+ lock = repo.lock()
try:
marks = repo._bookmarks
if hex(marks.get(key, '')) != old:
@@ -176,7 +176,7 @@
write(repo)
return True
finally:
- w.release()
+ lock.release()
def updatefromremote(ui, repo, remote, path):
ui.debug("checking for updated bookmarks\n")