Mercurial > public > mercurial-scm > hg-stable
diff hgext/shelve.py @ 25080:68f456f2f425
shelve: use try/except/finally
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 15 May 2015 09:55:31 -0500 |
parents | a02d293a1079 |
children | ce00b2e96d09 |
line wrap: on
line diff
--- a/hgext/shelve.py Fri May 15 09:55:15 2015 -0500 +++ b/hgext/shelve.py Fri May 15 09:55:31 2015 -0500 @@ -284,17 +284,15 @@ """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)