This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9714

shelve: extract some repeated creation of shelf instances to variables
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGae7a77a7ebc0: shelve: extract some repeated creation of shelf instances to variables
rHGc48186bda68b: shelve: extract some repeated creation of shelf instances to variables
rHG2a61db691b6b: shelve: extract some repeated creation of shelf instances to variables
Summary

This just looks cleaner to me; I'd be surprised if there's any
measurable performance improvement.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (21 lines)

Diff 24737

mercurial/shelve.py

% len(stat.deleted) % len(stat.deleted)
) )
else: else:
ui.status(_(b"nothing changed\n")) ui.status(_(b"nothing changed\n"))
def _shelvecreatedcommit(repo, node, name, match): def _shelvecreatedcommit(repo, node, name, match):
info = {b'node': hex(node)} info = {b'node': hex(node)}
Shelf(repo, name).writeinfo(info) shelf = Shelf(repo, name)
shelf.writeinfo(info)
bases = list(mutableancestors(repo[node])) bases = list(mutableancestors(repo[node]))
Shelf(repo, name).writebundle(bases, node) shelf.writebundle(bases, node)
with Shelf(repo, name).open_patch(b'wb') as fp: with shelf.open_patch(b'wb') as fp:
cmdutil.exportfile( cmdutil.exportfile(
repo, [node], fp, opts=mdiff.diffopts(git=True), match=match repo, [node], fp, opts=mdiff.diffopts(git=True), match=match
) )
def _includeunknownfiles(repo, pats, opts, extra): def _includeunknownfiles(repo, pats, opts, extra):
s = repo.status(match=scmutil.match(repo[None], pats, opts), unknown=True) s = repo.status(match=scmutil.match(repo[None], pats, opts), unknown=True)
if s.unknown: if s.unknown:
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.InputError(_(b'no shelved changes specified!')) raise error.InputError(_(b'no shelved changes specified!'))
with repo.wlock(): with repo.wlock():
for name in pats: for name in pats:
if not Shelf(repo, name).exists(): shelf = Shelf(repo, name)
if not shelf.exists():
raise error.InputError( raise error.InputError(
_(b"shelved change '%s' not found") % name _(b"shelved change '%s' not found") % name
) )
Shelf(repo, name).movetobackup() shelf.movetobackup()
cleanupoldbackups(repo) cleanupoldbackups(repo)
def listshelves(repo): def listshelves(repo):
"""return all shelves in repo as list of (time, name)""" """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:
tmpwctx = repo[node] tmpwctx = repo[node]
return tmpwctx, addedbefore return tmpwctx, addedbefore
def _unshelverestorecommit(ui, repo, tr, basename): def _unshelverestorecommit(ui, repo, tr, basename):
"""Recreate commit in the repository during the unshelve""" """Recreate commit in the repository during the unshelve"""
repo = repo.unfiltered() repo = repo.unfiltered()
node = None node = None
if Shelf(repo, basename).hasinfo(): shelf = Shelf(repo, basename)
node = Shelf(repo, basename).readinfo()[b'node'] if shelf.hasinfo():
node = shelf.readinfo()[b'node']
if node is None or node not in repo: if node is None or node not in repo:
with ui.configoverride({(b'ui', b'quiet'): True}): with ui.configoverride({(b'ui', b'quiet'): True}):
shelvectx = Shelf(repo, basename).applybundle(tr) shelvectx = shelf.applybundle(tr)
# We might not strip the unbundled changeset, so we should keep track of # We might not strip the unbundled changeset, so we should keep track of
# the unshelve node in case we need to reuse it (eg: unshelve --keep) # the unshelve node in case we need to reuse it (eg: unshelve --keep)
if node is None: if node is None:
info = {b'node': hex(shelvectx.node())} info = {b'node': hex(shelvectx.node())}
Shelf(repo, basename).writeinfo(info) shelf.writeinfo(info)
else: else:
shelvectx = repo[node] shelvectx = repo[node]
return repo, shelvectx return repo, shelvectx
def _createunshelvectx(ui, repo, shelvectx, basename, interactive, opts): def _createunshelvectx(ui, repo, shelvectx, basename, interactive, opts):
"""Handles the creation of unshelve commit and updates the shelve if it """Handles the creation of unshelve commit and updates the shelve if it