##// END OF EJS Templates
shelve: fix a missing variable in the exception handler for delete...
Matt Harbison -
r44123:cb23d9e3 stable
parent child Browse files
Show More
@@ -603,8 +603,8 b' def deletecmd(ui, repo, pats):'
603 if not pats:
603 if not pats:
604 raise error.Abort(_(b'no shelved changes specified!'))
604 raise error.Abort(_(b'no shelved changes specified!'))
605 with repo.wlock():
605 with repo.wlock():
606 for name in pats:
606 try:
607 try:
607 for name in pats:
608 for suffix in shelvefileextensions:
608 for suffix in shelvefileextensions:
609 shfile = shelvedfile(repo, name, suffix)
609 shfile = shelvedfile(repo, name, suffix)
610 # patch file is necessary, as it should
610 # patch file is necessary, as it should
@@ -614,11 +614,11 b' def deletecmd(ui, repo, pats):'
614 # bundle
614 # bundle
615 if shfile.exists() or suffix == patchextension:
615 if shfile.exists() or suffix == patchextension:
616 shfile.movetobackup()
616 shfile.movetobackup()
617 cleanupoldbackups(repo)
618 except OSError as err:
617 except OSError as err:
619 if err.errno != errno.ENOENT:
618 if err.errno != errno.ENOENT:
620 raise
619 raise
621 raise error.Abort(_(b"shelved change '%s' not found") % name)
620 raise error.Abort(_(b"shelved change '%s' not found") % name)
621 cleanupoldbackups(repo)
622
622
623
623
624 def listshelves(repo):
624 def listshelves(repo):
General Comments 0
You need to be logged in to leave comments. Login now