This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9705

shelve: move function for opening .patch file to new shelf class
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG58ca94869287: shelve: move function for opening .patch file to new shelf class
rHG9c1d7ce898e7: shelve: move function for opening .patch file to new shelf class
rHGd20cc2802b1f: shelve: move function for opening .patch file to new shelf class
Summary

The opener() method was used specifically for the .patch file, and
the new Shelf class deals with all files involved in a shelf, so I
renamed the function in the process.

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 (8 lines)

Diff 24940

mercurial/shelve.py

def movetobackup(self): def movetobackup(self):
if not self.backupvfs.isdir(): if not self.backupvfs.isdir():
self.backupvfs.makedir() self.backupvfs.makedir()
util.rename(self.filename(), self.backupfilename()) util.rename(self.filename(), self.backupfilename())
def stat(self): def stat(self):
return self.vfs.stat(self.fname) return self.vfs.stat(self.fname)
def opener(self, mode=b'rb'):
return self.vfs(self.fname, mode)
class Shelf(object): class Shelf(object):
"""Represents a shelf, including possibly multiple files storing it. """Represents a shelf, including possibly multiple files storing it.
Old shelves will have a .patch and a .hg file. Newer shelves will Old shelves will have a .patch and a .hg file. Newer shelves will
also have a .shelve file. This class abstracts away some of the also have a .shelve file. This class abstracts away some of the
differences and lets you work with the shelf as a whole. differences and lets you work with the shelf as a whole.
""" """
shelvectx = self.repo[b'tip'] shelvectx = self.repo[b'tip']
if pretip == shelvectx: if pretip == shelvectx:
shelverev = tr.changes[b'revduplicates'][-1] shelverev = tr.changes[b'revduplicates'][-1]
shelvectx = self.repo[shelverev] shelvectx = self.repo[shelverev]
return shelvectx return shelvectx
finally: finally:
fp.close() fp.close()
def open_patch(self, mode=b'rb'):
return self.vfs(self.name + b'.patch', mode)
class shelvedstate(object): class shelvedstate(object):
"""Handle persistence during unshelving operations. """Handle persistence during unshelving operations.
Handles saving and restoring a shelved state. Ensures that different Handles saving and restoring a shelved state. Ensures that different
versions of a shelved state are possible and handles them appropriately. versions of a shelved state are possible and handles them appropriately.
""" """
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(repo, name).writeinfo(info)
bases = list(mutableancestors(repo[node])) bases = list(mutableancestors(repo[node]))
Shelf(repo, name).writebundle(bases, node) Shelf(repo, name).writebundle(bases, node)
with shelvedfile(repo, name, patchextension).opener(b'wb') as fp: with Shelf(repo, name).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: