From e49bc6543bd802994fd589839d2cdeb69cf8b77f Mon Sep 17 00:00:00 2001 From: Matt Mackall Date: Fri, 15 May 2015 09:55:31 -0500 Subject: [PATCH] shelve: use try/except/finally --- hgext/shelve.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/hgext/shelve.py b/hgext/shelve.py index 6c6ca3728f..a70852cc1f 100644 --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -284,17 +284,15 @@ def deletecmd(ui, repo, pats): """subcommand that deletes a specific shelve""" if not pats: raise util.Abort(_('no shelved changes specified!')) - wlock = None + wlock = repo.wlock() try: - wlock = repo.wlock() - try: - for name in pats: - for suffix in 'hg patch'.split(): - shelvedfile(repo, name, suffix).unlink() - except OSError, err: - if err.errno != errno.ENOENT: - raise - raise util.Abort(_("shelved change '%s' not found") % name) + for name in pats: + for suffix in 'hg patch'.split(): + shelvedfile(repo, name, suffix).unlink() + except OSError, err: + if err.errno != errno.ENOENT: + raise + raise util.Abort(_("shelved change '%s' not found") % name) finally: lockmod.release(wlock)