with: use context manager in unshelveabort

hgext/shelve.py

@@ -461,7 +461,7 def pathtofiles(repo, files):
 
 def unshelveabort(ui, repo, state, opts):
     """subcommand that abort an in-progress unshelve"""
-    lock = None
+    with repo.lock():
     try:
         checkparents(repo, state)
 
@@ -476,15 +476,12 def unshelveabort(ui, repo, state, opts)
                         repo.join('unshelverebasestate'))
             raise
 
-        lock = repo.lock()
-
         mergefiles(ui, repo, state.wctx, state.pendingctx)
-
-        repair.strip(ui, repo, state.stripnodes, backup=False, topic='shelve')
+            repair.strip(ui, repo, state.stripnodes, backup=False,
+                         topic='shelve')
     finally:
         shelvedstate.clear(repo)
         ui.warn(_("unshelve of '%s' aborted\n") % state.name)
-        lockmod.release(lock)
 
 def mergefiles(ui, repo, wctx, shelvectx):
     """updates to wctx and merges the changes from shelvectx into the