This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9720

shelve: don't crash on file with unexpected extension in .hg/shelved/
ClosedPublic

Authored by martinvonz on Jan 11 2021, 1:04 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc062874a35db: shelve: don't crash on file with unexpected extension in .hg/shelved/
rHG8500d6210763: shelve: don't crash on file with unexpected extension in .hg/shelved/
rHG5456fef19d6b: shelve: don't crash on file with unexpected extension in .hg/shelved/
Summary

We assumed that the files in the .hg/shelved/ directory have an
extension. That's a valid assumption except that users may put garbage
in the directory. This patch fixes the crash by simply not assuming
that the result of splittin a string at '.' yields an extension. We
don't use the extension since the previous patch anyway.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (2 lines)
Mtests/test-shelve2.t (8 lines)

Diff 24739

mercurial/shelve.py

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:
raise raise
return [] return []
info = [] info = []
seen = set() seen = set()
for (filename, _type) in names: for (filename, _type) in names:
name, ext = filename.rsplit(b'.', 1) name = filename.rsplit(b'.', 1)[0]
if name in seen: if name in seen:
continue continue
seen.add(name) seen.add(name)
shelf = Shelf(repo, name) shelf = Shelf(repo, name)
if not shelf.exists(): if not shelf.exists():
continue continue
mtime = shelf.mtime() mtime = shelf.mtime()
info.append((mtime, name)) info.append((mtime, name))

tests/test-shelve2.t

[10] [10]
$ find .hg/shelve* $ find .hg/shelve*
.hg/shelved .hg/shelved
.hg/shelved/junk1.patch .hg/shelved/junk1.patch
.hg/shelved/junk2.hg .hg/shelved/junk2.hg
# A file with an unexpected extension # A file with an unexpected extension
$ touch .hg/shelved/junk3 $ touch .hg/shelved/junk3
$ hg shelve -l 2>&1 | grep ValueError $ hg shelve -l
ValueError: not enough values to unpack (expected 2, got 1) $ hg unshelve
$ hg unshelve 2>&1 | grep ValueError abort: no shelved changes to apply!
ValueError: not enough values to unpack (expected 2, got 1) [20]
$ hg shelve -d junk3 $ hg shelve -d junk3
abort: shelved change 'junk3' not found abort: shelved change 'junk3' not found
[10] [10]
$ find .hg/shelve* $ find .hg/shelve*
.hg/shelved .hg/shelved
.hg/shelved/junk1.patch .hg/shelved/junk1.patch
.hg/shelved/junk3 .hg/shelved/junk3
.hg/shelved/junk2.hg .hg/shelved/junk2.hg