##// END OF EJS Templates
with: use context manager in update
Bryan O'Sullivan -
r27854:55394c6f default
parent child Browse files
Show More
@@ -6932,8 +6932,7 b' def update(ui, repo, node=None, rev=None'
6932 if rev is None or rev == '':
6932 if rev is None or rev == '':
6933 rev = node
6933 rev = node
6934
6934
6935 wlock = repo.wlock()
6935 with repo.wlock():
6936 try:
6937 cmdutil.clearunfinished(repo)
6936 cmdutil.clearunfinished(repo)
6938
6937
6939 if date:
6938 if date:
@@ -6980,8 +6979,6 b' def update(ui, repo, node=None, rev=None'
6980 ui.status(_("(leaving bookmark %s)\n") %
6979 ui.status(_("(leaving bookmark %s)\n") %
6981 repo._activebookmark)
6980 repo._activebookmark)
6982 bookmarks.deactivate(repo)
6981 bookmarks.deactivate(repo)
6983 finally:
6984 wlock.release()
6985
6982
6986 return ret
6983 return ret
6987
6984
General Comments 0
You need to be logged in to leave comments. Login now