( )⚙ D9708 shelve: make listshelves() return shelf names instead of filenames

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9708

shelve: make listshelves() return shelf names instead of filenames
ClosedPublic

Authored by martinvonz on Jan 8 2021, 3:36 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa34607b6d320: shelve: make listshelves() return shelf names instead of filenames
rHG1d656da3ae4d: shelve: make listshelves() return shelf names instead of filenames
rHGaa79b48bba8a: shelve: make listshelves() return shelf names instead of filenames
Summary

All three callers now prefer the shelf name over the filename (already
before my recent patches, two out of three callers preferred the shelf
name).

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (18 lines)

Diff 24943

mercurial/shelve.py

for suffix in shelvefileextensions: for suffix in shelvefileextensions:
shfile = shelvedfile(repo, name, suffix) shfile = shelvedfile(repo, name, suffix)
if shfile.exists(): if shfile.exists():
shfile.movetobackup() shfile.movetobackup()
cleanupoldbackups(repo) 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, name)"""
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:
raise raise
return [] return []
info = [] info = []
for (name, _type) in names: for (name, _type) in names:
pfx, sfx = name.rsplit(b'.', 1) pfx, sfx = name.rsplit(b'.', 1)
if not pfx or sfx != patchextension: if not pfx or sfx != patchextension:
continue continue
mtime = Shelf(repo, pfx).mtime() mtime = Shelf(repo, pfx).mtime()
info.append((mtime, shelvedfile(repo, pfx).filename())) info.append((mtime, pfx))
return sorted(info, reverse=True) return sorted(info, reverse=True)
def listcmd(ui, repo, pats, opts): def listcmd(ui, repo, pats, opts):
"""subcommand that displays the list of shelves""" """subcommand that displays the list of shelves"""
pats = set(pats) pats = set(pats)
width = 80 width = 80
if not ui.plain(): if not ui.plain():
width = ui.termwidth() width = ui.termwidth()
namelabel = b'shelve.newest' namelabel = b'shelve.newest'
ui.pager(b'shelve') ui.pager(b'shelve')
for mtime, name in listshelves(repo): for mtime, name in listshelves(repo):
sname = util.split(name)[1] if pats and name not in pats:
if pats and sname not in pats:
continue continue
ui.write(sname, label=namelabel) ui.write(name, label=namelabel)
namelabel = b'shelve.name' namelabel = b'shelve.name'
if ui.quiet: if ui.quiet:
ui.write(b'\n') ui.write(b'\n')
continue continue
ui.write(b' ' * (16 - len(sname))) ui.write(b' ' * (16 - len(name)))
used = 16 used = 16
date = dateutil.makedate(mtime) date = dateutil.makedate(mtime)
age = b'(%s)' % templatefilters.age(date, abbrev=True) age = b'(%s)' % templatefilters.age(date, abbrev=True)
ui.write(age, label=b'shelve.age') ui.write(age, label=b'shelve.age')
ui.write(b' ' * (12 - len(age))) ui.write(b' ' * (12 - len(age)))
used += 12 used += 12
with Shelf(repo, sname).open_patch() as fp: with Shelf(repo, name).open_patch() as fp:
while True: while True:
line = fp.readline() line = fp.readline()
if not line: if not line:
break break
if not line.startswith(b'#'): if not line.startswith(b'#'):
desc = line.rstrip() desc = line.rstrip()
if ui.formatted(): if ui.formatted():
desc = stringutil.ellipsis(desc, width - used) desc = stringutil.ellipsis(desc, width - used)
def patchcmds(ui, repo, pats, opts): def patchcmds(ui, repo, pats, opts):
"""subcommand that displays shelves""" """subcommand that displays shelves"""
if len(pats) == 0: if len(pats) == 0:
shelves = listshelves(repo) shelves = listshelves(repo)
if not shelves: if not shelves:
raise error.Abort(_(b"there are no shelves to show")) raise error.Abort(_(b"there are no shelves to show"))
mtime, name = shelves[0] mtime, name = shelves[0]
sname = util.split(name)[1] pats = [name]
pats = [sname]
for shelfname in pats: for shelfname in pats:
if not Shelf(repo, shelfname).exists(): if not Shelf(repo, shelfname).exists():
raise error.Abort(_(b"cannot find shelf %s") % shelfname) raise error.Abort(_(b"cannot find shelf %s") % shelfname)
listcmd(ui, repo, pats, opts) listcmd(ui, repo, pats, opts)
elif continuef: elif continuef:
return unshelvecontinue(ui, repo, state, opts) return unshelvecontinue(ui, repo, state, opts)
elif len(shelved) > 1: elif len(shelved) > 1:
raise error.InputError(_(b'can only unshelve one change at a time')) raise error.InputError(_(b'can only unshelve one change at a time'))
elif not shelved: elif not shelved:
shelved = listshelves(repo) shelved = listshelves(repo)
if not shelved: if not shelved:
raise error.StateError(_(b'no shelved changes to apply!')) raise error.StateError(_(b'no shelved changes to apply!'))
basename = util.split(shelved[0][1])[1] basename = shelved[0][1]
ui.status(_(b"unshelving change '%s'\n") % basename) ui.status(_(b"unshelving change '%s'\n") % basename)
else: else:
basename = shelved[0] basename = shelved[0]
if not Shelf(repo, basename).exists(): if not Shelf(repo, basename).exists():
raise error.InputError(_(b"shelved change '%s' not found") % basename) raise error.InputError(_(b"shelved change '%s' not found") % basename)
return _dounshelve(ui, repo, basename, opts) return _dounshelve(ui, repo, basename, opts)