# HG changeset patch # User Bryan O'Sullivan # Date 1452892490 28800 # Node ID 63821023ea7958dffedf9f1ff7c26ce0dcadbf6e # Parent 7417e1c102537731bf5ae9cee9cef52186ebad17 with: use context manager in localrepo recover diff -r 7417e1c10253 -r 63821023ea79 mercurial/localrepo.py --- a/mercurial/localrepo.py Fri Jan 15 13:14:50 2016 -0800 +++ b/mercurial/localrepo.py Fri Jan 15 13:14:50 2016 -0800 @@ -1126,8 +1126,7 @@ self.svfs.tryread("phaseroots")) def recover(self): - lock = self.lock() - try: + with self.lock(): if self.svfs.exists("journal"): self.ui.status(_("rolling back interrupted transaction\n")) vfsmap = {'': self.svfs, @@ -1139,8 +1138,6 @@ else: self.ui.warn(_("no interrupted transaction available\n")) return False - finally: - lock.release() def rollback(self, dryrun=False, force=False): wlock = lock = dsguard = None