This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7457

shelve: fix a missing variable in the exception handler for delete
ClosedPublic

Authored by mharbison72 on Nov 19 2019, 5:46 PM.

Details

Reviewers
dlax
pulkit
Group Reviewers
hg-reviewers
Commits
rHGcb23d9e3e21f: shelve: fix a missing variable in the exception handler for delete
Summary

Caught by pytype. I haven't paid much attention to the progress of this
extension, but I *think* this was the intent.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Nov 19 2019, 5:46 PM
mharbison72 added a comment.Nov 19 2019, 9:43 PM

This and the next one should probably go on stable. I'm a bit surprised there's no test coverage, at least for the next one.

dlax accepted this revision.Nov 20 2019, 2:59 AM
dlax added a subscriber: dlax.

I don't see any test for hg shelve --delete NAME that's not a command error case; adding some in D7460.

pulkit accepted this revision.Nov 21 2019, 7:29 AM
This revision is now accepted and ready to land.Nov 21 2019, 7:29 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (12 lines)

Diff 18260

mercurial/shelve.py

cleanupoldbackups(repo) cleanupoldbackups(repo)
def deletecmd(ui, repo, pats): def deletecmd(ui, repo, pats):
"""subcommand that deletes a specific shelve""" """subcommand that deletes a specific shelve"""
if not pats: if not pats:
raise error.Abort(_(b'no shelved changes specified!')) raise error.Abort(_(b'no shelved changes specified!'))
with repo.wlock(): with repo.wlock():
try:
for name in pats: for name in pats:
try:
for suffix in shelvefileextensions: for suffix in shelvefileextensions:
shfile = shelvedfile(repo, name, suffix) shfile = shelvedfile(repo, name, suffix)
# patch file is necessary, as it should # patch file is necessary, as it should
# be present for any kind of shelve, # be present for any kind of shelve,
# but the .hg file is optional as in future we # but the .hg file is optional as in future we
# will add obsolete shelve with does not create a # will add obsolete shelve with does not create a
# bundle # bundle
if shfile.exists() or suffix == patchextension: if shfile.exists() or suffix == patchextension:
shfile.movetobackup() shfile.movetobackup()
cleanupoldbackups(repo)
except OSError as err: except OSError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
raise error.Abort(_(b"shelved change '%s' not found") % name) raise error.Abort(_(b"shelved change '%s' not found") % name)
cleanupoldbackups(repo)
def listshelves(repo): def listshelves(repo):
"""return all shelves in repo as list of (time, filename)""" """return all shelves in repo as list of (time, filename)"""
try: try:
names = repo.vfs.readdir(shelvedir) names = repo.vfs.readdir(shelvedir)
except OSError as err: except OSError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT: