This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4138

changegroup: pull _fileheader out of cgpacker
ClosedPublic

Authored by indygreg on Aug 6 2018, 3:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG227ebd88ce5e: changegroup: pull _fileheader out of cgpacker
Summary

It doesn't need any state from the packer.

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

indygreg created this revision.Aug 6 2018, 3:51 PM
Closed by commit rHG227ebd88ce5e: changegroup: pull _fileheader out of cgpacker (authored by indygreg). · Explain WhyAug 9 2018, 2:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (11 lines)

Diff 10145

mercurial/changegroup.py

def chunkheader(length): def chunkheader(length):
"""return a changegroup chunk header (string)""" """return a changegroup chunk header (string)"""
return struct.pack(">l", length + 4) return struct.pack(">l", length + 4)
def closechunk(): def closechunk():
"""return a changegroup chunk header (string) for a zero-length chunk""" """return a changegroup chunk header (string) for a zero-length chunk"""
return struct.pack(">l", 0) return struct.pack(">l", 0)
def _fileheader(path):
"""Obtain a changegroup chunk header for a named path."""
return chunkheader(len(path)) + path
def writechunks(ui, chunks, filename, vfs=None): def writechunks(ui, chunks, filename, vfs=None):
"""Write chunks to a file and return its filename. """Write chunks to a file and return its filename.
The stream is assumed to be a bundle file. The stream is assumed to be a bundle file.
Existing files will not be overwritten. Existing files will not be overwritten.
If no filename is specified, a temporary file is created. If no filename is specified, a temporary file is created.
""" """
fh = None fh = None
# Ellipses serving mode. # Ellipses serving mode.
self._clrevtolocalrev.clear() self._clrevtolocalrev.clear()
if self._nextclrevtolocalrev is not None: if self._nextclrevtolocalrev is not None:
self._clrevtolocalrev = self._nextclrevtolocalrev self._clrevtolocalrev = self._nextclrevtolocalrev
self._nextclrevtolocalrev = None self._nextclrevtolocalrev = None
return closechunk() return closechunk()
def _fileheader(self, fname):
return chunkheader(len(fname)) + fname
# Extracted both for clarity and for overriding in extensions. # Extracted both for clarity and for overriding in extensions.
def _sortgroup(self, store, ischangelog, nodelist, lookup): def _sortgroup(self, store, ischangelog, nodelist, lookup):
"""Sort nodes for change group and turn them into revnums.""" """Sort nodes for change group and turn them into revnums."""
# Ellipses serving mode. # Ellipses serving mode.
# #
# In a perfect world, we'd generate better ellipsis-ified graphs # In a perfect world, we'd generate better ellipsis-ified graphs
# for non-changelog revlogs. In practice, we haven't started doing # for non-changelog revlogs. In practice, we haven't started doing
# that yet, so the resulting DAGs for the manifestlog and filelogs # that yet, so the resulting DAGs for the manifestlog and filelogs
"""Pack manifests into a changegroup stream. """Pack manifests into a changegroup stream.
Encodes the directory name in the output so multiple manifests Encodes the directory name in the output so multiple manifests
can be sent. Multiple manifests is not supported by cg1 and cg2. can be sent. Multiple manifests is not supported by cg1 and cg2.
""" """
if dir: if dir:
assert self.version == b'03' assert self.version == b'03'
yield self._fileheader(dir) yield _fileheader(dir)
# TODO violates storage abstractions by assuming revlogs. # TODO violates storage abstractions by assuming revlogs.
dirlog = self._repo.manifestlog._revlog.dirlog(dir) dirlog = self._repo.manifestlog._revlog.dirlog(dir)
for chunk in self.group(mfnodes, dirlog, False, lookuplinknode, for chunk in self.group(mfnodes, dirlog, False, lookuplinknode,
units=_('manifests')): units=_('manifests')):
yield chunk yield chunk
def generate(self, commonrevs, clnodes, fastpathlinkrev, source): def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
# Lookup for filenodes, we collected the linkrev nodes above in the # Lookup for filenodes, we collected the linkrev nodes above in the
# fastpath case and with lookupmf in the slowpath case. # fastpath case and with lookupmf in the slowpath case.
def lookupfilelog(x): def lookupfilelog(x):
return linkrevnodes[x] return linkrevnodes[x]
filenodes = self._prune(filerevlog, linkrevnodes, commonrevs) filenodes = self._prune(filerevlog, linkrevnodes, commonrevs)
if filenodes: if filenodes:
progress.update(i + 1, item=fname) progress.update(i + 1, item=fname)
h = self._fileheader(fname) h = _fileheader(fname)
size = len(h) size = len(h)
yield h yield h
for chunk in self.group(filenodes, filerevlog, False, for chunk in self.group(filenodes, filerevlog, False,
lookupfilelog): lookupfilelog):
size += len(chunk) size += len(chunk)
yield chunk yield chunk
self._verbosenote(_('%8.i %s\n') % (size, fname)) self._verbosenote(_('%8.i %s\n') % (size, fname))
progress.complete() progress.complete()