diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -6932,8 +6932,7 @@ def update(ui, repo, node=None, rev=None if rev is None or rev == '': rev = node - wlock = repo.wlock() - try: + with repo.wlock(): cmdutil.clearunfinished(repo) if date: @@ -6980,8 +6979,6 @@ def update(ui, repo, node=None, rev=None ui.status(_("(leaving bookmark %s)\n") % repo._activebookmark) bookmarks.deactivate(repo) - finally: - wlock.release() return ret