##// END OF EJS Templates
registrar: add delayregistrar class to register function in extensions...
registrar: add delayregistrar class to register function in extensions 'delayregistrar' delays actual registration of function until 'setup()' invocation on it.

File last commit:

r27433:12f727a5 default
r27585:60bf90eb default
Show More
changegroup.py
1096 lines | 41.3 KiB | text/x-python | PythonLexer
Martin Geisler
put license and copyright info into comment blocks
r8226 # changegroup.py - Mercurial changegroup manipulation functions
#
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Matt Mackall
Replace demandload with new demandimport
r3877
Gregory Szorc
changegroup: use absolute_import
r25921 from __future__ import absolute_import
import os
import struct
import tempfile
Pierre-Yves David
localrepo: move the addchangegroup method in changegroup module...
r20933 import weakref
Gregory Szorc
changegroup: use absolute_import
r25921
from .i18n import _
from .node import (
hex,
nullid,
nullrev,
short,
)
from . import (
branchmap,
dagutil,
discovery,
error,
mdiff,
phases,
util,
)
Thomas Arendsen Hein
make incoming work via ssh (issue139); move chunk code into separate module....
r1981
Sune Foldager
changegroup: rename bundle-related functions and classes...
r22390 _CHANGEGROUPV1_DELTA_HEADER = "20s20s20s20s"
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181 _CHANGEGROUPV2_DELTA_HEADER = "20s20s20s20s20s"
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 _CHANGEGROUPV3_DELTA_HEADER = ">20s20s20s20s20sH"
Benoit Boissinot
bundler: make parsechunk return the base revision of the delta
r14141
Mads Kiilerich
changegroup: verify all stream reads...
r13457 def readexactly(stream, n):
'''read n bytes from stream.read and abort if less was available'''
s = stream.read(n)
if len(s) < n:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("stream ended unexpectedly"
Mads Kiilerich
changegroup: verify all stream reads...
r13457 " (got %d bytes, expected %d)")
% (len(s), n))
return s
def getchunk(stream):
"""return the next chunk from stream as a string"""
d = readexactly(stream, 4)
Thomas Arendsen Hein
make incoming work via ssh (issue139); move chunk code into separate module....
r1981 l = struct.unpack(">l", d)[0]
if l <= 4:
Mads Kiilerich
changegroup: don't accept odd chunk headers
r13458 if l:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("invalid chunk length %d") % l)
Thomas Arendsen Hein
make incoming work via ssh (issue139); move chunk code into separate module....
r1981 return ""
Mads Kiilerich
changegroup: verify all stream reads...
r13457 return readexactly(stream, l - 4)
Thomas Arendsen Hein
make incoming work via ssh (issue139); move chunk code into separate module....
r1981
Matt Mackall
changegroup: avoid large copies...
r5368 def chunkheader(length):
Greg Ward
Improve some docstrings relating to changegroups and prepush().
r9437 """return a changegroup chunk header (string)"""
Matt Mackall
changegroup: avoid large copies...
r5368 return struct.pack(">l", length + 4)
Thomas Arendsen Hein
make incoming work via ssh (issue139); move chunk code into separate module....
r1981
def closechunk():
Greg Ward
Improve some docstrings relating to changegroups and prepush().
r9437 """return a changegroup chunk header (string) for a zero-length chunk"""
Thomas Arendsen Hein
make incoming work via ssh (issue139); move chunk code into separate module....
r1981 return struct.pack(">l", 0)
Eric Sumner
pullbundle2: extract addchangegroup result combining into its own function...
r23890 def combineresults(results):
"""logic to combine 0 or more addchangegroup results into one"""
changedheads = 0
result = 1
for ret in results:
# If any changegroup result is 0, return 0
if ret == 0:
result = 0
break
if ret < -1:
changedheads += ret + 1
elif ret > 1:
changedheads += ret - 1
if changedheads > 0:
result = 1 + changedheads
elif changedheads < 0:
result = -1 + changedheads
return result
Matt Mackall
unduplicate bundle writing code from httprepo
r3662 bundletypes = {
Yuya Nishihara
readbundle: fix typo of None compression...
r26272 "": ("", None), # only when using unbundle on ssh and old http servers
Benoit Boissinot
bundle: more comments about the different header types, remove useless if
r14060 # since the unification ssh accepts a header but there
# is no capability signaling it.
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 "HG20": (), # special-cased below
Pierre-Yves David
readbundle: map 'HG10UN' to None compression...
r26271 "HG10UN": ("HG10UN", None),
Pierre-Yves David
changegroup: move all compressions utilities in util...
r26266 "HG10BZ": ("HG10", 'BZ'),
"HG10GZ": ("HG10GZ", 'GZ'),
Matt Mackall
unduplicate bundle writing code from httprepo
r3662 }
Martin Geisler
typos: "it's" -> "its"
r9087 # hgweb uses this list to communicate its preferred type
Dirkjan Ochtman
hgweb: use bundletypes from mercurial.changegroup
r6152 bundlepriority = ['HG10GZ', 'HG10BZ', 'HG10UN']
Pierre-Yves David
changegroup: extract the file management part in its own function...
r26540 def writechunks(ui, chunks, filename, vfs=None):
"""Write chunks to a file and return its filename.
Matt Mackall
move write_bundle to changegroup.py
r3659
Pierre-Yves David
changegroup: extract the file management part in its own function...
r26540 The stream is assumed to be a bundle file.
Matt Mackall
move write_bundle to changegroup.py
r3659 Existing files will not be overwritten.
If no filename is specified, a temporary file is created.
"""
fh = None
cleanup = None
try:
if filename:
FUJIWARA Katsunori
changegroup: add "vfs" argument to "writebundle()" for relative access via vfs...
r20976 if vfs:
fh = vfs.open(filename, "wb")
else:
fh = open(filename, "wb")
Matt Mackall
move write_bundle to changegroup.py
r3659 else:
fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg")
fh = os.fdopen(fd, "wb")
cleanup = filename
Pierre-Yves David
changegroup: extract the file management part in its own function...
r26540 for c in chunks:
fh.write(c)
Matt Mackall
move write_bundle to changegroup.py
r3659 cleanup = None
return filename
finally:
if fh is not None:
fh.close()
if cleanup is not None:
FUJIWARA Katsunori
changegroup: add "vfs" argument to "writebundle()" for relative access via vfs...
r20976 if filename and vfs:
vfs.unlink(cleanup)
else:
os.unlink(cleanup)
Matt Mackall
create a readbundle function
r3660
Pierre-Yves David
changegroup: extract the file management part in its own function...
r26540 def writebundle(ui, cg, filename, bundletype, vfs=None, compression=None):
"""Write a bundle file and return its filename.
Existing files will not be overwritten.
If no filename is specified, a temporary file is created.
bz2 compression can be turned off.
The bundle file will be deleted in case of errors.
"""
if bundletype == "HG20":
from . import bundle2
bundle = bundle2.bundle20(ui)
bundle.setcompression(compression)
part = bundle.newpart('changegroup', data=cg.getchunks())
part.addparam('version', cg.version)
chunkiter = bundle.getchunks()
else:
# compression argument is only for the bundle2 case
assert compression is None
if cg.version != '01':
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('old bundle types only supports v1 '
'changegroups'))
Pierre-Yves David
changegroup: extract the file management part in its own function...
r26540 header, comp = bundletypes[bundletype]
if comp not in util.compressors:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('unknown stream compression type: %s')
% comp)
Pierre-Yves David
changegroup: extract the file management part in its own function...
r26540 z = util.compressors[comp]()
subchunkiter = cg.getchunks()
def chunkiter():
yield header
for chunk in subchunkiter:
yield z.compress(chunk)
yield z.flush()
chunkiter = chunkiter()
# parse the changegroup data, otherwise we will block
# in case of sshrepo because we don't know the end of the stream
# an empty chunkgroup is the end of the changegroup
# a changegroup has at least 2 chunkgroups (changelog and manifest).
# after that, an empty chunkgroup is the end of the changegroup
return writechunks(ui, chunkiter, filename, vfs=vfs)
Sune Foldager
changegroup: rename bundle-related functions and classes...
r22390 class cg1unpacker(object):
Augie Fackler
changegroup: document the public surface area of cg?unpackers...
r26708 """Unpacker for cg1 changegroup streams.
A changegroup unpacker handles the framing of the revision data in
the wire format. Most consumers will want to use the apply()
method to add the changes from the changegroup to a repository.
If you're forwarding a changegroup unmodified to another consumer,
use getchunks(), which returns an iterator of changegroup
chunks. This is mostly useful for cases where you need to know the
data stream has ended by observing the end of the changegroup.
deltachunk() is useful only if you're applying delta data. Most
consumers should prefer apply() instead.
A few other public methods exist. Those are used only for
bundlerepo and some debug commands - their use is discouraged.
"""
Sune Foldager
changegroup: rename bundle-related functions and classes...
r22390 deltaheader = _CHANGEGROUPV1_DELTA_HEADER
Benoit Boissinot
bundler: make parsechunk return the base revision of the delta
r14141 deltaheadersize = struct.calcsize(deltaheader)
Eric Sumner
changegroup.writebundle: HG2Y support...
r23896 version = '01'
Matt Mackall
bundle: introduce bundle class
r12043 def __init__(self, fh, alg):
Pierre-Yves David
compression: use 'None' for no-compression...
r26267 if alg == 'UN':
alg = None # get more modern without breaking too much
Pierre-Yves David
changegroup: move all compressions utilities in util...
r26266 if not alg in util.decompressors:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('unknown stream compression type: %s')
Pierre-Yves David
changegroup: move all compressions utilities in util...
r26266 % alg)
Pierre-Yves David
changegroup: use a different compression key for BZ in HG10...
r26392 if alg == 'BZ':
alg = '_truncatedBZ'
Pierre-Yves David
changegroup: move all compressions utilities in util...
r26266 self._stream = util.decompressors[alg](fh)
Matt Mackall
bundlerepo: remove duplication of bundle decompressors
r12044 self._type = alg
Matt Mackall
bundle: refactor progress callback...
r12334 self.callback = None
Augie Fackler
changegroup: note why a few methods on cg1unpacker exist...
r26706
# These methods (compressed, read, seek, tell) all appear to only
# be used by bundlerepo, but it's a little hard to tell.
Matt Mackall
bundlerepo: remove duplication of bundle decompressors
r12044 def compressed(self):
Pierre-Yves David
compression: use 'None' for no-compression...
r26267 return self._type is not None
Matt Mackall
bundle: introduce bundle class
r12043 def read(self, l):
return self._stream.read(l)
Matt Mackall
bundle: make unbundle object seekable...
r12330 def seek(self, pos):
return self._stream.seek(pos)
def tell(self):
Matt Mackall
bundlerepo: use bundle objects everywhere
r12332 return self._stream.tell()
Matt Mackall
bundlerepo: restore close() method
r12347 def close(self):
return self._stream.close()
Matt Mackall
bundle: refactor progress callback...
r12334
Augie Fackler
changegroup: mark cg1unpacker.chunklength as private
r26707 def _chunklength(self):
Jim Hague
changegroup: fix typo introduced in 9f2c407caf34
r13459 d = readexactly(self._stream, 4)
Mads Kiilerich
changegroup: don't accept odd chunk headers
r13458 l = struct.unpack(">l", d)[0]
if l <= 4:
if l:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("invalid chunk length %d") % l)
Mads Kiilerich
changegroup: don't accept odd chunk headers
r13458 return 0
if self.callback:
Matt Mackall
bundle: refactor progress callback...
r12334 self.callback()
Mads Kiilerich
changegroup: don't accept odd chunk headers
r13458 return l - 4
Matt Mackall
bundle: refactor progress callback...
r12334
Benoit Boissinot
unbundler: separate delta and header parsing...
r14144 def changelogheader(self):
"""v10 does not have a changelog header chunk"""
return {}
def manifestheader(self):
"""v10 does not have a manifest header chunk"""
return {}
def filelogheader(self):
"""return the header of the filelogs chunk, v10 only has the filename"""
Augie Fackler
changegroup: mark cg1unpacker.chunklength as private
r26707 l = self._chunklength()
Benoit Boissinot
unbundler: separate delta and header parsing...
r14144 if not l:
return {}
fname = readexactly(self._stream, l)
Augie Fackler
changegroup: move from dict() construction to {} literals...
r20675 return {'filename': fname}
Matt Mackall
bundle: refactor progress callback...
r12334
Benoit Boissinot
bundler: make parsechunk return the base revision of the delta
r14141 def _deltaheader(self, headertuple, prevnode):
node, p1, p2, cs = headertuple
if prevnode is None:
deltabase = p1
else:
deltabase = prevnode
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 flags = 0
return node, p1, p2, deltabase, cs, flags
Benoit Boissinot
bundler: make parsechunk return the base revision of the delta
r14141
Benoit Boissinot
unbundler: separate delta and header parsing...
r14144 def deltachunk(self, prevnode):
Augie Fackler
changegroup: mark cg1unpacker.chunklength as private
r26707 l = self._chunklength()
Matt Mackall
bundle: move chunk parsing into unbundle class
r12336 if not l:
return {}
Benoit Boissinot
bundler: make parsechunk return the base revision of the delta
r14141 headerdata = readexactly(self._stream, self.deltaheadersize)
header = struct.unpack(self.deltaheader, headerdata)
delta = readexactly(self._stream, l - self.deltaheadersize)
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 node, p1, p2, deltabase, cs, flags = self._deltaheader(header, prevnode)
Augie Fackler
changegroup: move from dict() construction to {} literals...
r20675 return {'node': node, 'p1': p1, 'p2': p2, 'cs': cs,
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 'deltabase': deltabase, 'delta': delta, 'flags': flags}
Matt Mackall
bundle: move chunk parsing into unbundle class
r12336
Pierre-Yves David
changegroup: move chunk extraction into a getchunks method of unbundle10...
r20999 def getchunks(self):
"""returns all the chunks contains in the bundle
Used when you need to forward the binary stream to a file or another
network API. To do so, it parse the changegroup data, otherwise it will
block in case of sshrepo because it don't know the end of the stream.
"""
# an empty chunkgroup is the end of the changegroup
# a changegroup has at least 2 chunkgroups (changelog and manifest).
# after that, an empty chunkgroup is the end of the changegroup
empty = False
count = 0
while not empty or count <= 2:
empty = True
count += 1
while True:
chunk = getchunk(self)
if not chunk:
break
empty = False
yield chunkheader(len(chunk))
pos = 0
while pos < len(chunk):
next = pos + 2**20
yield chunk[pos:next]
pos = next
yield closechunk()
Augie Fackler
changegroup: move manifest unpacking into its own method...
r26712 def _unpackmanifests(self, repo, revmap, trp, prog, numchanges):
# We know that we'll never have more manifests than we had
# changesets.
self.callback = prog(_('manifests'), numchanges)
# no need to check for empty manifest group here:
# if the result of the merge of 1 and 2 is the same in 3 and 4,
# no new manifest will be created and the manifest group will
# be empty during the pull
self.manifestheader()
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 repo.manifest.narrowdebug = repo.ui.warn
Augie Fackler
changegroup: move manifest unpacking into its own method...
r26712 repo.manifest.addgroup(self, revmap, trp)
repo.ui.progress(_('manifests'), None)
Augie Fackler
changegroup: migrate addchangegroup() to forward to cg?unpacker.apply()...
r26695 def apply(self, repo, srctype, url, emptyok=False,
targetphase=phases.draft, expectedtotal=None):
"""Add the changegroup returned by source.read() to this repo.
srctype is a string like 'push', 'pull', or 'unbundle'. url is
the URL of the repo where this changegroup is coming from.
Return an integer summarizing the change to this repo:
- nothing changed or no source: 0
- more heads than before: 1+added heads (2..n)
- fewer heads than before: -1-removed heads (-2..-n)
- number of heads stays the same: 1
"""
repo = repo.unfiltered()
Augie Fackler
changegroup: note during bundle apply if the repo was empty...
r27218 wasempty = (len(repo.changelog) == 0)
Augie Fackler
changegroup: migrate addchangegroup() to forward to cg?unpacker.apply()...
r26695 def csmap(x):
repo.ui.debug("add changeset %s\n" % short(x))
return len(cl)
def revmap(x):
return cl.rev(x)
changesets = files = revisions = 0
tr = repo.transaction("\n".join([srctype, util.hidepassword(url)]))
Pierre-Yves David
changegroup: fix the scope of a try finally...
r26880 try:
# The transaction could have been created before and already
# carries source information. In this case we use the top
# level data. We overwrite the argument because we need to use
# the top level value (if they exist) in this function.
srctype = tr.hookargs.setdefault('source', srctype)
url = tr.hookargs.setdefault('url', url)
Pierre-Yves David
changegroup: call 'prechangegroup' hook before setting up write delay...
r26881 repo.hook('prechangegroup', throw=True, **tr.hookargs)
Augie Fackler
changegroup: migrate addchangegroup() to forward to cg?unpacker.apply()...
r26695
Pierre-Yves David
changegroup: fix the scope of a try finally...
r26880 # write changelog data to temp files so concurrent readers
# will not see an inconsistent view
cl = repo.changelog
cl.delayupdate(tr)
oldheads = cl.heads()
Augie Fackler
changegroup: migrate addchangegroup() to forward to cg?unpacker.apply()...
r26695
trp = weakref.proxy(tr)
# pull off the changeset group
repo.ui.status(_("adding changesets\n"))
clstart = len(cl)
class prog(object):
def __init__(self, step, total):
self._step = step
self._total = total
self._count = 1
def __call__(self):
repo.ui.progress(self._step, self._count, unit=_('chunks'),
total=self._total)
self._count += 1
self.callback = prog(_('changesets'), expectedtotal)
efiles = set()
def onchangelog(cl, node):
efiles.update(cl.read(node)[3])
self.changelogheader()
srccontent = cl.addgroup(self, csmap, trp,
addrevisioncb=onchangelog)
efiles = len(efiles)
if not (srccontent or emptyok):
raise error.Abort(_("received changelog group is empty"))
clend = len(cl)
changesets = clend - clstart
repo.ui.progress(_('changesets'), None)
# pull off the manifest group
repo.ui.status(_("adding manifests\n"))
Augie Fackler
changegroup: move manifest unpacking into its own method...
r26712 self._unpackmanifests(repo, revmap, trp, prog, changesets)
Augie Fackler
changegroup: migrate addchangegroup() to forward to cg?unpacker.apply()...
r26695
needfiles = {}
if repo.ui.configbool('server', 'validate', default=False):
# validate incoming csets have their manifests
for cset in xrange(clstart, clend):
mfnode = repo.changelog.read(repo.changelog.node(cset))[0]
mfest = repo.manifest.readdelta(mfnode)
# store file nodes we must see
for f, n in mfest.iteritems():
needfiles.setdefault(f, set()).add(n)
# process the files
repo.ui.status(_("adding file changes\n"))
self.callback = None
pr = prog(_('files'), efiles)
Augie Fackler
changegroup: mark _addchangegroupfiles as module-private...
r26704 newrevs, newfiles = _addchangegroupfiles(
Augie Fackler
changegroup: note during bundle apply if the repo was empty...
r27218 repo, self, revmap, trp, pr, needfiles, wasempty)
Augie Fackler
changegroup: migrate addchangegroup() to forward to cg?unpacker.apply()...
r26695 revisions += newrevs
files += newfiles
dh = 0
if oldheads:
heads = cl.heads()
dh = len(heads) - len(oldheads)
for h in heads:
if h not in oldheads and repo[h].closesbranch():
dh -= 1
htext = ""
if dh:
htext = _(" (%+d heads)") % dh
repo.ui.status(_("added %d changesets"
" with %d changes to %d files%s\n")
% (changesets, revisions, files, htext))
repo.invalidatevolatilesets()
if changesets > 0:
if 'node' not in tr.hookargs:
tr.hookargs['node'] = hex(cl.node(clstart))
hookargs = dict(tr.hookargs)
else:
hookargs = dict(tr.hookargs)
hookargs['node'] = hex(cl.node(clstart))
FUJIWARA Katsunori
hook: centralize passing HG_PENDING to external hook process...
r26751 repo.hook('pretxnchangegroup', throw=True, **hookargs)
Augie Fackler
changegroup: migrate addchangegroup() to forward to cg?unpacker.apply()...
r26695
added = [cl.node(r) for r in xrange(clstart, clend)]
publishing = repo.publishing()
if srctype in ('push', 'serve'):
# Old servers can not push the boundary themselves.
# New servers won't push the boundary if changeset already
# exists locally as secret
#
# We should not use added here but the list of all change in
# the bundle
if publishing:
phases.advanceboundary(repo, tr, phases.public, srccontent)
else:
# Those changesets have been pushed from the outside, their
# phases are going to be pushed alongside. Therefor
# `targetphase` is ignored.
phases.advanceboundary(repo, tr, phases.draft, srccontent)
phases.retractboundary(repo, tr, phases.draft, added)
elif srctype != 'strip':
# publishing only alter behavior during push
#
# strip should not touch boundary at all
phases.retractboundary(repo, tr, targetphase, added)
if changesets > 0:
if srctype != 'strip':
# During strip, branchcache is invalid but coming call to
# `destroyed` will repair it.
# In other case we can safely update cache on disk.
branchmap.updatecache(repo.filtered('served'))
def runhooks():
# These hooks run when the lock releases, not when the
# transaction closes. So it's possible for the changelog
# to have changed since we last saw it.
if clstart >= len(repo):
return
# forcefully update the on-disk branch cache
repo.ui.debug("updating the branch cache\n")
repo.hook("changegroup", **hookargs)
for n in added:
args = hookargs.copy()
args['node'] = hex(n)
repo.hook("incoming", **args)
newheads = [h for h in repo.heads() if h not in oldheads]
repo.ui.log("incoming",
"%s incoming changes - new heads: %s\n",
len(added),
', '.join([hex(c[:6]) for c in newheads]))
tr.addpostclose('changegroup-runhooks-%020i' % clstart,
lambda tr: repo._afterlock(runhooks))
tr.close()
finally:
tr.release()
repo.ui.flush()
# never return 0 here:
if dh < 0:
return dh - 1
else:
return dh + 1
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181 class cg2unpacker(cg1unpacker):
Augie Fackler
changegroup: document the public surface area of cg?unpackers...
r26708 """Unpacker for cg2 streams.
cg2 streams add support for generaldelta, so the delta header
format is slightly different. All other features about the data
remain the same.
"""
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181 deltaheader = _CHANGEGROUPV2_DELTA_HEADER
deltaheadersize = struct.calcsize(deltaheader)
Eric Sumner
changegroup.writebundle: HG2Y support...
r23896 version = '02'
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181
def _deltaheader(self, headertuple, prevnode):
node, p1, p2, deltabase, cs = headertuple
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 flags = 0
return node, p1, p2, deltabase, cs, flags
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 class cg3unpacker(cg2unpacker):
"""Unpacker for cg3 streams.
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 cg3 streams add support for exchanging treemanifests and revlog
flags, so the only changes from cg2 are the delta header and
version number.
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 """
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 deltaheader = _CHANGEGROUPV3_DELTA_HEADER
deltaheadersize = struct.calcsize(deltaheader)
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 version = '03'
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 def _deltaheader(self, headertuple, prevnode):
node, p1, p2, deltabase, cs, flags = headertuple
return node, p1, p2, deltabase, cs, flags
Matt Mackall
bundle: push chunkbuffer down into decompress...
r12329 class headerlessfixup(object):
def __init__(self, fh, h):
self._h = h
self._fh = fh
def read(self, n):
if self._h:
d, self._h = self._h[:n], self._h[n:]
if len(d) < n:
Mads Kiilerich
changegroup: verify all stream reads...
r13457 d += readexactly(self._fh, n - len(d))
Matt Mackall
bundle: push chunkbuffer down into decompress...
r12329 return d
Mads Kiilerich
changegroup: verify all stream reads...
r13457 return readexactly(self._fh, n)
Matt Mackall
bundle: push chunkbuffer down into decompress...
r12329
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 def _moddirs(files):
"""Given a set of modified files, find the list of modified directories.
This returns a list of (path to changed dir, changed dir) tuples,
as that's what the one client needs anyway.
>>> _moddirs(['a/b/c.py', 'a/b/c.txt', 'a/d/e/f/g.txt', 'i.txt', ])
[('/', 'a/'), ('a/', 'b/'), ('a/', 'd/'), ('a/d/', 'e/'), ('a/d/e/', 'f/')]
"""
alldirs = set()
for f in files:
path = f.split('/')[:-1]
for i in xrange(len(path) - 1, -1, -1):
dn = '/'.join(path[:i])
current = dn + '/', path[i] + '/'
if current in alldirs:
break
alldirs.add(current)
return sorted(alldirs)
Sune Foldager
changegroup: rename bundle-related functions and classes...
r22390 class cg1packer(object):
deltaheader = _CHANGEGROUPV1_DELTA_HEADER
Eric Sumner
changegroup.writebundle: HG2Y support...
r23896 version = '01'
Sune Foldager
bundle-ng: move gengroup into bundler, pass repo object to bundler...
r19202 def __init__(self, repo, bundlecaps=None):
"""Given a source repo, construct a bundler.
bundlecaps is optional and can be used to specify the set of
capabilities which can be used to build the bundle.
"""
Benoit Boissinot
bundle-ng: add bundlecaps argument to getbundle() command
r19201 # Set of capabilities we can use to build the bundle.
if bundlecaps is None:
bundlecaps = set()
self._bundlecaps = bundlecaps
Matt Mackall
generaldelta: mark experimental reordering option
r25831 # experimental config: bundle.reorder
Sune Foldager
bundle-ng: move gengroup into bundler, pass repo object to bundler...
r19202 reorder = repo.ui.config('bundle', 'reorder', 'auto')
if reorder == 'auto':
reorder = None
else:
reorder = util.parsebool(reorder)
self._repo = repo
self._reorder = reorder
Benoit Boissinot
bundle-ng: move progress handling out of the linkrev callback
r19208 self._progress = repo.ui.progress
Mads Kiilerich
bundle: when verbose, show what takes up the space in the generated bundle...
r23748 if self._repo.ui.verbose and not self._repo.ui.debugflag:
self._verbosenote = self._repo.ui.note
else:
self._verbosenote = lambda s: None
Matt Mackall
changegroup: introduce bundler objects...
r13831 def close(self):
return closechunk()
Sune Foldager
bundle-ng: move group into the bundler...
r19200
Matt Mackall
changegroup: introduce bundler objects...
r13831 def fileheader(self, fname):
return chunkheader(len(fname)) + fname
Sune Foldager
bundle-ng: move group into the bundler...
r19200
Martin von Zweigbergk
changegroup.group: drop 'reorder' parameter...
r24912 def group(self, nodelist, revlog, lookup, units=None):
Sune Foldager
bundle-ng: move group into the bundler...
r19200 """Calculate a delta group, yielding a sequence of changegroup chunks
(strings).
Given a list of changeset revs, return a set of deltas and
metadata corresponding to nodes. The first delta is
first parent(nodelist[0]) -> nodelist[0], the receiver is
guaranteed to have this parent as it has all history before
these changesets. In the case firstparent is nullrev the
changegroup starts with a full revision.
Benoit Boissinot
bundle-ng: move progress handling out of the linkrev callback
r19208
If units is not None, progress detail will be generated, units specifies
the type of revlog that is touched (changelog, manifest, etc.).
Sune Foldager
bundle-ng: move group into the bundler...
r19200 """
# if we don't have any revisions touched by these changesets, bail
if len(nodelist) == 0:
yield self.close()
return
# for generaldelta revlogs, we linearize the revs; this will both be
# much quicker and generate a much smaller bundle
Martin von Zweigbergk
changegroup.group: drop 'reorder' parameter...
r24912 if (revlog._generaldelta and self._reorder is None) or self._reorder:
Sune Foldager
bundle-ng: move group into the bundler...
r19200 dag = dagutil.revlogdag(revlog)
revs = set(revlog.rev(n) for n in nodelist)
revs = dag.linearize(revs)
else:
revs = sorted([revlog.rev(n) for n in nodelist])
# add the parent of the first rev
p = revlog.parentrevs(revs[0])[0]
revs.insert(0, p)
# build deltas
Benoit Boissinot
bundle-ng: move progress handling out of the linkrev callback
r19208 total = len(revs) - 1
msgbundling = _('bundling')
Sune Foldager
bundle-ng: move group into the bundler...
r19200 for r in xrange(len(revs) - 1):
Benoit Boissinot
bundle-ng: move progress handling out of the linkrev callback
r19208 if units is not None:
self._progress(msgbundling, r + 1, unit=units, total=total)
Sune Foldager
bundle-ng: move group into the bundler...
r19200 prev, curr = revs[r], revs[r + 1]
Benoit Boissinot
bundle-ng: simplify lookup and state handling...
r19207 linknode = lookup(revlog.node(curr))
for c in self.revchunk(revlog, curr, prev, linknode):
Sune Foldager
bundle-ng: move group into the bundler...
r19200 yield c
Martin von Zweigbergk
changegroup: close progress in same function as it's started...
r24901 if units is not None:
self._progress(msgbundling, None)
Sune Foldager
bundle-ng: move group into the bundler...
r19200 yield self.close()
Durham Goode
bundle: refactor changegroup prune to be its own function...
r19289 # filter any nodes that claim to be part of the known set
Martin von Zweigbergk
changegroup: removed unused 'source' parameter from prune()...
r24896 def prune(self, revlog, missing, commonrevs):
Durham Goode
bundle: refactor changegroup prune to be its own function...
r19289 rr, rl = revlog.rev, revlog.linkrev
return [n for n in missing if rl(rr(n)) not in commonrevs]
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 def _packmanifests(self, mfnodes, tmfnodes, lookuplinknode):
Augie Fackler
changegroup: move manifest packing into a separate function...
r26711 """Pack flat manifests into a changegroup stream."""
ml = self._repo.manifest
size = 0
for chunk in self.group(
mfnodes, ml, lookuplinknode, units=_('manifests')):
size += len(chunk)
yield chunk
self._verbosenote(_('%8.i (manifests)\n') % size)
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 # It looks odd to assert this here, but tmfnodes doesn't get
# filled in until after we've called lookuplinknode for
# sending root manifests, so the only way to tell the streams
# got crossed is to check after we've done all the work.
assert not tmfnodes
Augie Fackler
changegroup: move manifest packing into a separate function...
r26711
Benoit Boissinot
bundle-ng: move bundle generation to changegroup.py
r19204 def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
Sune Foldager
bundle-ng: move gengroup into bundler, pass repo object to bundler...
r19202 '''yield a sequence of changegroup chunks (strings)'''
repo = self._repo
Martin von Zweigbergk
changegroup: drop _changelog and _manifest properties...
r24978 cl = repo.changelog
ml = repo.manifest
Benoit Boissinot
bundle-ng: move bundle generation to changegroup.py
r19204
Durham Goode
changegroup: fix file linkrevs during reorders (issue4462)...
r23381 clrevorder = {}
Benoit Boissinot
bundle-ng: move bundle generation to changegroup.py
r19204 mfs = {} # needed manifests
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 tmfnodes = {}
Benoit Boissinot
bundle-ng: move bundle generation to changegroup.py
r19204 fnodes = {} # needed file nodes
Augie Fackler
changegroup: avoid iterating the whole manifest...
r27237 # maps manifest node id -> set(changed files)
mfchangedfiles = {}
Benoit Boissinot
bundle-ng: move bundle generation to changegroup.py
r19204
Benoit Boissinot
bundle-ng: simplify lookup and state handling...
r19207 # Callback for the changelog, used to collect changed files and manifest
# nodes.
# Returns the linkrev node (identity in the changelog case).
def lookupcl(x):
c = cl.read(x)
Durham Goode
changegroup: fix file linkrevs during reorders (issue4462)...
r23381 clrevorder[x] = len(clrevorder)
Augie Fackler
changegroup: avoid iterating the whole manifest...
r27237 n = c[0]
Benoit Boissinot
bundle-ng: simplify lookup and state handling...
r19207 # record the first changeset introducing this manifest version
Augie Fackler
changegroup: avoid iterating the whole manifest...
r27237 mfs.setdefault(n, x)
# Record a complete list of potentially-changed files in
# this manifest.
mfchangedfiles.setdefault(n, set()).update(c[3])
Benoit Boissinot
bundle-ng: simplify lookup and state handling...
r19207 return x
Benoit Boissinot
bundle-ng: move bundle generation to changegroup.py
r19204
Mads Kiilerich
bundle: when verbose, show what takes up the space in the generated bundle...
r23748 self._verbosenote(_('uncompressed size of bundle content:\n'))
size = 0
Martin von Zweigbergk
changegroup.group: drop 'reorder' parameter...
r24912 for chunk in self.group(clnodes, cl, lookupcl, units=_('changesets')):
Mads Kiilerich
bundle: when verbose, show what takes up the space in the generated bundle...
r23748 size += len(chunk)
Gregory Szorc
changegroup: don't define lookupmf() until it is needed...
r23224 yield chunk
Mads Kiilerich
bundle: when verbose, show what takes up the space in the generated bundle...
r23748 self._verbosenote(_('%8.i (changelog)\n') % size)
Gregory Szorc
changegroup: don't define lookupmf() until it is needed...
r23224
Martin von Zweigbergk
changegroup: document the cases where reordering complicates linkrevs
r24977 # We need to make sure that the linkrev in the changegroup refers to
# the first changeset that introduced the manifest or file revision.
# The fastpath is usually safer than the slowpath, because the filelogs
# are walked in revlog order.
#
# When taking the slowpath with reorder=None and the manifest revlog
# uses generaldelta, the manifest may be walked in the "wrong" order.
# Without 'clrevorder', we would get an incorrect linkrev (see fix in
# cc0ff93d0c0c).
#
# When taking the fastpath, we are only vulnerable to reordering
# of the changelog itself. The changelog never uses generaldelta, so
# it is only reordered when reorder=True. To handle this case, we
# simply take the slowpath, which already has the 'clrevorder' logic.
# This was also fixed in cc0ff93d0c0c.
Martin von Zweigbergk
changegroup: extract condition for linkrev fastpath...
r24976 fastpathlinkrev = fastpathlinkrev and not self._reorder
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 # Treemanifests don't work correctly with fastpathlinkrev
# either, because we don't discover which directory nodes to
# send along with files. This could probably be fixed.
fastpathlinkrev = fastpathlinkrev and (
'treemanifest' not in repo.requirements)
Benoit Boissinot
bundle-ng: simplify lookup and state handling...
r19207 # Callback for the manifest, used to collect linkrevs for filelog
# revisions.
# Returns the linkrev node (collected in lookupcl).
Augie Fackler
changegroup: remove one special case from lookupmflinknode...
r27239 if fastpathlinkrev:
lookupmflinknode = mfs.__getitem__
else:
def lookupmflinknode(x):
"""Callback for looking up the linknode for manifests.
Augie Fackler
changegroup: document manifest linkrev callback some more...
r27219
Augie Fackler
changegroup: remove one special case from lookupmflinknode...
r27239 Returns the linkrev node for the specified manifest.
Augie Fackler
changegroup: document manifest linkrev callback some more...
r27219
Augie Fackler
changegroup: remove one special case from lookupmflinknode...
r27239 SIDE EFFECT:
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 1) fclnodes gets populated with the list of relevant
file nodes if we're not using fastpathlinkrev
2) When treemanifests are in use, collects treemanifest nodes
to send
Augie Fackler
changegroup: document manifest linkrev callback some more...
r27219
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 Note that this means manifests must be completely sent to
the client before you can trust the list of files and
treemanifests to send.
Augie Fackler
changegroup: remove one special case from lookupmflinknode...
r27239 """
clnode = mfs[x]
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 # We no longer actually care about reading deltas of
# the manifest here, because we already know the list
# of changed files, so for treemanifests (which
# lazily-load anyway to *generate* a readdelta) we can
# just load them with read() and then we'll actually
# be able to correctly load node IDs from the
# submanifest entries.
if 'treemanifest' in repo.requirements:
mdata = ml.read(x)
else:
mdata = ml.readfast(x)
Augie Fackler
changegroup: avoid iterating the whole manifest...
r27237 for f in mfchangedfiles[x]:
Augie Fackler
changegroup: drop 'if True' that made the previous change clearer
r27238 try:
n = mdata[f]
except KeyError:
continue
# record the first changeset introducing this filelog
# version
fclnodes = fnodes.setdefault(f, {})
fclnode = fclnodes.setdefault(n, clnode)
if clrevorder[clnode] < clrevorder[fclnode]:
fclnodes[n] = clnode
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 # gather list of changed treemanifest nodes
if 'treemanifest' in repo.requirements:
submfs = {'/': mdata}
for dn, bn in _moddirs(mfchangedfiles[x]):
submf = submfs[dn]
submf = submf._dirs[bn]
submfs[submf.dir()] = submf
tmfclnodes = tmfnodes.setdefault(submf.dir(), {})
tmfclnodes.setdefault(submf._node, clnode)
if clrevorder[clnode] < clrevorder[fclnode]:
tmfclnodes[n] = clnode
Augie Fackler
changegroup: remove one special case from lookupmflinknode...
r27239 return clnode
Sune Foldager
bundle-ng: simplify bundle10.generate...
r19206
Martin von Zweigbergk
changegroup: rename 'mf' to 'ml' to match 'cl', since it's a revlog...
r24899 mfnodes = self.prune(ml, mfs, commonrevs)
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 for x in self._packmanifests(
mfnodes, tmfnodes, lookupmflinknode):
Augie Fackler
changegroup: move manifest packing into a separate function...
r26711 yield x
Sune Foldager
bundle-ng: simplify bundle10.generate...
r19206
mfs.clear()
Martin von Zweigbergk
changegroup: rename 'needed' to 'clrevs' to match 'clnodes'
r24898 clrevs = set(cl.rev(x) for x in clnodes)
Sune Foldager
bundle-ng: simplify bundle10.generate...
r19206
Augie Fackler
changegroup: clean up file lookup function...
r27240 if not fastpathlinkrev:
def linknodes(unused, fname):
return fnodes.get(fname, {})
else:
Augie Fackler
changegroup: restate file linknode callback using generator expressions...
r27241 cln = cl.node
Augie Fackler
changegroup: clean up file lookup function...
r27240 def linknodes(filerevlog, fname):
Sean Farley
changegroup: remove unused variable caught by pyflakes
r20936 llr = filerevlog.linkrev
Augie Fackler
changegroup: restate file linknode callback using generator expressions...
r27241 fln = filerevlog.node
revs = ((r, llr(r)) for r in filerevlog)
return dict((fln(r), cln(lr)) for r, lr in revs if lr in clrevs)
Benoit Boissinot
bundle-ng: simplify lookup and state handling...
r19207
Augie Fackler
changegroup: avoid iterating the whole manifest...
r27237 changedfiles = set()
for x in mfchangedfiles.itervalues():
changedfiles.update(x)
Durham Goode
bundle: move file chunk generation to it's own function...
r19334 for chunk in self.generatefiles(changedfiles, linknodes, commonrevs,
source):
yield chunk
yield self.close()
if clnodes:
repo.hook('outgoing', node=hex(clnodes[0]), source=source)
Martin von Zweigbergk
changegroup: document that 'source' parameter exists for extensions...
r24897 # The 'source' parameter is useful for extensions
Durham Goode
bundle: move file chunk generation to it's own function...
r19334 def generatefiles(self, changedfiles, linknodes, commonrevs, source):
repo = self._repo
progress = self._progress
msgbundling = _('bundling')
total = len(changedfiles)
# for progress output
msgfiles = _('files')
for i, fname in enumerate(sorted(changedfiles)):
filerevlog = repo.file(fname)
if not filerevlog:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("empty or missing revlog for %s") % fname)
Durham Goode
bundle: move file chunk generation to it's own function...
r19334
linkrevnodes = linknodes(filerevlog, fname)
Benoit Boissinot
bundle-ng: simplify lookup and state handling...
r19207 # Lookup for filenodes, we collected the linkrev nodes above in the
# fastpath case and with lookupmf in the slowpath case.
def lookupfilelog(x):
return linkrevnodes[x]
Martin von Zweigbergk
changegroup: removed unused 'source' parameter from prune()...
r24896 filenodes = self.prune(filerevlog, linkrevnodes, commonrevs)
Sune Foldager
bundle-ng: simplify bundle10.generate...
r19206 if filenodes:
Benoit Boissinot
bundle-ng: move progress handling out of the linkrev callback
r19208 progress(msgbundling, i + 1, item=fname, unit=msgfiles,
total=total)
Mads Kiilerich
bundle: when verbose, show what takes up the space in the generated bundle...
r23748 h = self.fileheader(fname)
size = len(h)
yield h
Martin von Zweigbergk
changegroup.group: drop 'reorder' parameter...
r24912 for chunk in self.group(filenodes, filerevlog, lookupfilelog):
Mads Kiilerich
bundle: when verbose, show what takes up the space in the generated bundle...
r23748 size += len(chunk)
Sune Foldager
bundle-ng: move gengroup into bundler, pass repo object to bundler...
r19202 yield chunk
Mads Kiilerich
bundle: when verbose, show what takes up the space in the generated bundle...
r23748 self._verbosenote(_('%8.i %s\n') % (size, fname))
Martin von Zweigbergk
changegroup: close progress in same function as it's started...
r24901 progress(msgbundling, None)
Sune Foldager
bundle-ng: move group into the bundler...
r19200
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181 def deltaparent(self, revlog, rev, p1, p2, prev):
return prev
Benoit Boissinot
bundle-ng: simplify lookup and state handling...
r19207 def revchunk(self, revlog, rev, prev, linknode):
Benoit Boissinot
changegroup: new bundler API
r14143 node = revlog.node(rev)
p1, p2 = revlog.parentrevs(rev)
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181 base = self.deltaparent(revlog, rev, p1, p2, prev)
Benoit Boissinot
changegroup: new bundler API
r14143
prefix = ''
Mike Edgar
changegroup: emit full-replacement deltas if either revision is censored...
r24190 if revlog.iscensored(base) or revlog.iscensored(rev):
try:
delta = revlog.revision(node)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except error.CensoredNodeError as e:
Mike Edgar
changegroup: emit full-replacement deltas if either revision is censored...
r24190 delta = e.tombstone
if base == nullrev:
prefix = mdiff.trivialdiffheader(len(delta))
else:
baselen = revlog.rawsize(base)
prefix = mdiff.replacediffheader(baselen, len(delta))
elif base == nullrev:
Benoit Boissinot
changegroup: new bundler API
r14143 delta = revlog.revision(node)
prefix = mdiff.trivialdiffheader(len(delta))
else:
delta = revlog.revdiff(base, rev)
p1n, p2n = revlog.parents(node)
basenode = revlog.node(base)
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 flags = revlog.flags(rev)
meta = self.builddeltaheader(node, p1n, p2n, basenode, linknode, flags)
Benoit Boissinot
changegroup: new bundler API
r14143 meta += prefix
l = len(meta) + len(delta)
Matt Mackall
changegroup: introduce bundler objects...
r13831 yield chunkheader(l)
yield meta
Benoit Boissinot
changegroup: new bundler API
r14143 yield delta
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 def builddeltaheader(self, node, p1n, p2n, basenode, linknode, flags):
Benoit Boissinot
changegroup: new bundler API
r14143 # do nothing with basenode, it is implicitly the previous one in HG10
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 # do nothing with flags, it is implicitly 0 for cg1 and cg2
Benoit Boissinot
changegroup: new bundler API
r14143 return struct.pack(self.deltaheader, node, p1n, p2n, linknode)
Pierre-Yves David
localrepo: move the _changegroupsubset method in changegroup module...
r20925
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181 class cg2packer(cg1packer):
Eric Sumner
changegroup.writebundle: HG2Y support...
r23896 version = '02'
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181 deltaheader = _CHANGEGROUPV2_DELTA_HEADER
Martin von Zweigbergk
cg2packer: set reorder=False in __init__ instead of in group()...
r24911 def __init__(self, repo, bundlecaps=None):
super(cg2packer, self).__init__(repo, bundlecaps)
if self._reorder is None:
# Since generaldelta is directly supported by cg2, reordering
# generally doesn't help, so we disable it by default (treating
# bundle.reorder=auto just like bundle.reorder=False).
self._reorder = False
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181
def deltaparent(self, revlog, rev, p1, p2, prev):
dp = revlog.deltaparent(rev)
# avoid storing full revisions; pick prev in those cases
# also pick prev when we can't be sure remote has dp
if dp == nullrev or (dp != p1 and dp != p2 and dp != prev):
return prev
return dp
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 def builddeltaheader(self, node, p1n, p2n, basenode, linknode, flags):
# Do nothing with flags, it is implicitly 0 in cg1 and cg2
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181 return struct.pack(self.deltaheader, node, p1n, p2n, basenode, linknode)
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 class cg3packer(cg2packer):
version = '03'
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 deltaheader = _CHANGEGROUPV3_DELTA_HEADER
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432
def _packmanifests(self, mfnodes, tmfnodes, lookuplinknode):
# Note that debug prints are super confusing in this code, as
# tmfnodes gets populated by the calls to lookuplinknode in
# the superclass's manifest packer. In the future we should
# probably see if we can refactor this somehow to be less
# confusing.
for x in super(cg3packer, self)._packmanifests(
mfnodes, {}, lookuplinknode):
yield x
dirlog = self._repo.manifest.dirlog
for name, nodes in tmfnodes.iteritems():
# For now, directory headers are simply file headers with
# a trailing '/' on the path.
yield self.fileheader(name + '/')
for chunk in self.group(nodes, dirlog(name), nodes.get):
yield chunk
Mike Edgar
changegroup: add flags field to cg3 delta header...
r27433 def builddeltaheader(self, node, p1n, p2n, basenode, linknode, flags):
return struct.pack(
self.deltaheader, node, p1n, p2n, basenode, linknode, flags)
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432
Sune Foldager
changegroup: introduce cg2packer/unpacker...
r23181 packermap = {'01': (cg1packer, cg1unpacker),
Augie Fackler
changegroup: reformat packermap and add comment...
r26709 # cg2 adds support for exchanging generaldelta
'02': (cg2packer, cg2unpacker),
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 # cg3 adds support for exchanging treemanifests
'03': (cg3packer, cg3unpacker),
Augie Fackler
changegroup: reformat packermap and add comment...
r26709 }
Pierre-Yves David
changegroup: add a "packermap" dictionary to track different packer versions...
r23168
Pierre-Yves David
localrepo: move the changegroupinfo method in changegroup module...
r20926 def _changegroupinfo(repo, nodes, source):
if repo.ui.verbose or source == 'bundle':
repo.ui.status(_("%d changesets found\n") % len(nodes))
if repo.ui.debugflag:
repo.ui.debug("list of changesets:\n")
for node in nodes:
repo.ui.debug("%s\n" % hex(node))
Sune Foldager
changegroup: introduce "raw" versions of some commands...
r23177 def getsubsetraw(repo, outgoing, bundler, source, fastpath=False):
Pierre-Yves David
localrepo: move the _changegroupsubset method in changegroup module...
r20925 repo = repo.unfiltered()
commonrevs = outgoing.common
csets = outgoing.missing
heads = outgoing.missingheads
# We go through the fast path if we get told to, or if all (unfiltered
# heads have been requested (since we then know there all linkrevs will
# be pulled by the client).
heads.sort()
fastpathlinkrev = fastpath or (
repo.filtername is None and heads == sorted(repo.heads()))
repo.hook('preoutgoing', throw=True, source=source)
Pierre-Yves David
localrepo: move the changegroupinfo method in changegroup module...
r20926 _changegroupinfo(repo, csets, source)
Sune Foldager
changegroup: introduce "raw" versions of some commands...
r23177 return bundler.generate(commonrevs, csets, fastpathlinkrev, source)
Pierre-Yves David
getsubset: get the unpacker version from the bundler...
r26595 def getsubset(repo, outgoing, bundler, source, fastpath=False):
Sune Foldager
changegroup: introduce "raw" versions of some commands...
r23177 gengroup = getsubsetraw(repo, outgoing, bundler, source, fastpath)
Pierre-Yves David
getsubset: get the unpacker version from the bundler...
r26595 return packermap[bundler.version][1](util.chunkbuffer(gengroup), None)
Pierre-Yves David
localrepo: move the changegroupsubset method in changegroup module...
r20927
Eric Sumner
changegroup.getsubset: support multiple versions...
r23897 def changegroupsubset(repo, roots, heads, source, version='01'):
Pierre-Yves David
localrepo: move the changegroupsubset method in changegroup module...
r20927 """Compute a changegroup consisting of all the nodes that are
descendants of any of the roots and ancestors of any of the heads.
Return a chunkbuffer object whose read() method will return
successive changegroup chunks.
It is fairly complex as determining which filenodes and which
manifest nodes need to be included for the changeset to be complete
is non-trivial.
Another wrinkle is doing the reverse, figuring out which changeset in
the changegroup a particular filenode or manifestnode belongs to.
"""
cl = repo.changelog
if not roots:
roots = [nullid]
discbases = []
for n in roots:
discbases.extend([p for p in cl.parents(n) if p != nullid])
Pierre-Yves David
changegroup: properly compute common base in changeggroupsubset (issue4736)...
r25677 # TODO: remove call to nodesbetween.
csets, roots, heads = cl.nodesbetween(roots, heads)
included = set(csets)
discbases = [n for n in discbases if n not in included]
Pierre-Yves David
localrepo: move the changegroupsubset method in changegroup module...
r20927 outgoing = discovery.outgoing(cl, discbases, heads)
Eric Sumner
changegroup.getsubset: support multiple versions...
r23897 bundler = packermap[version][0](repo)
Pierre-Yves David
getsubset: get the unpacker version from the bundler...
r26595 return getsubset(repo, outgoing, bundler, source)
Pierre-Yves David
localrepo: move the changegroupsubset method in changegroup module...
r20927
Sune Foldager
changegroup: allow use of different cg#packer in getchangegroupraw...
r23178 def getlocalchangegroupraw(repo, source, outgoing, bundlecaps=None,
version='01'):
Sune Foldager
changegroup: introduce "raw" versions of some commands...
r23177 """Like getbundle, but taking a discovery.outgoing as an argument.
This is only implemented for local repos and reuses potentially
precomputed sets in outgoing. Returns a raw changegroup generator."""
if not outgoing.missing:
return None
Sune Foldager
changegroup: allow use of different cg#packer in getchangegroupraw...
r23178 bundler = packermap[version][0](repo, bundlecaps)
Sune Foldager
changegroup: introduce "raw" versions of some commands...
r23177 return getsubsetraw(repo, outgoing, bundler, source)
Pierre-Yves David
changegroup: add version argument to getlocalchangegroup...
r26508 def getlocalchangegroup(repo, source, outgoing, bundlecaps=None,
version='01'):
Pierre-Yves David
localrepo: move the getlocalbundle method in changegroup module...
r20928 """Like getbundle, but taking a discovery.outgoing as an argument.
This is only implemented for local repos and reuses potentially
precomputed sets in outgoing."""
if not outgoing.missing:
return None
Pierre-Yves David
changegroup: add version argument to getlocalchangegroup...
r26508 bundler = packermap[version][0](repo, bundlecaps)
Pierre-Yves David
localrepo: move the getlocalbundle method in changegroup module...
r20928 return getsubset(repo, outgoing, bundler, source)
Gregory Szorc
changegroup: rename _computeoutgoing to computeoutgoing...
r25400 def computeoutgoing(repo, heads, common):
Durham Goode
changegroup: refactor outgoing logic into a function...
r21260 """Computes which revs are outgoing given a set of common
and a set of heads.
This is a separate function so extensions can have access to
the logic.
Returns a discovery.outgoing object.
"""
cl = repo.changelog
if common:
hasnode = cl.hasnode
common = [n for n in common if hasnode(n)]
else:
common = [nullid]
if not heads:
heads = cl.heads()
return discovery.outgoing(cl, common, heads)
Pierre-Yves David
changegroup: add version argument to getchangegroup...
r26509 def getchangegroup(repo, source, heads=None, common=None, bundlecaps=None,
version='01'):
Pierre-Yves David
localrepo: move the getbundle method in changegroup module...
r20930 """Like changegroupsubset, but returns the set difference between the
ancestors of heads and the ancestors common.
If heads is None, use the local heads. If common is None, use [nullid].
The nodes in common might not all be known locally due to the way the
current discovery protocol works.
"""
Gregory Szorc
changegroup: rename _computeoutgoing to computeoutgoing...
r25400 outgoing = computeoutgoing(repo, heads, common)
Pierre-Yves David
changegroup: add version argument to getchangegroup...
r26509 return getlocalchangegroup(repo, source, outgoing, bundlecaps=bundlecaps,
version=version)
Pierre-Yves David
localrepo: move the getbundle method in changegroup module...
r20930
Pierre-Yves David
localrepo: move the changegroup method in changegroup module...
r20931 def changegroup(repo, basenodes, source):
# to avoid a race we use changegroupsubset() (issue1320)
return changegroupsubset(repo, basenodes, repo.heads(), source)
Augie Fackler
changegroup: note during bundle apply if the repo was empty...
r27218 def _addchangegroupfiles(repo, source, revmap, trp, pr, needfiles, wasempty):
Pierre-Yves David
localrepo: move the addchangegroupfiles method in changegroup module...
r20932 revisions = 0
files = 0
while True:
chunkdata = source.filelogheader()
if not chunkdata:
break
f = chunkdata["filename"]
repo.ui.debug("adding %s revisions\n" % f)
pr()
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 directory = (f[-1] == '/')
if directory:
# a directory using treemanifests
# TODO fixup repo requirements safely
if 'treemanifest' not in repo.requirements:
if not wasempty:
raise error.Abort(_(
"bundle contains tree manifests, but local repo is "
"non-empty and does not use tree manifests"))
repo.requirements.add('treemanifest')
repo._applyopenerreqs()
repo._writerequirements()
repo.manifest._treeondisk = True
repo.manifest._treeinmem = True
fl = repo.manifest.dirlog(f)
else:
fl = repo.file(f)
Pierre-Yves David
localrepo: move the addchangegroupfiles method in changegroup module...
r20932 o = len(fl)
Mike Edgar
revlog: in addgroup, reject ill-formed deltas based on censored nodes...
r24120 try:
if not fl.addgroup(source, revmap, trp):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("received file revlog group is empty"))
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except error.CensoredBaseError as e:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("received delta base is censored: %s") % e)
Augie Fackler
changegroup: introduce cg3, which has support for exchanging treemanifests...
r27432 if not directory:
revisions += len(fl) - o
files += 1
Pierre-Yves David
localrepo: move the addchangegroupfiles method in changegroup module...
r20932 if f in needfiles:
needs = needfiles[f]
for new in xrange(o, len(fl)):
n = fl.node(new)
if n in needs:
needs.remove(n)
else:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(
Pierre-Yves David
localrepo: move the addchangegroupfiles method in changegroup module...
r20932 _("received spurious file revlog entry"))
if not needs:
del needfiles[f]
repo.ui.progress(_('files'), None)
for f, needs in needfiles.iteritems():
fl = repo.file(f)
for n in needs:
try:
fl.rev(n)
except error.LookupError:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(
Pierre-Yves David
localrepo: move the addchangegroupfiles method in changegroup module...
r20932 _('missing file data for %s:%s - run hg verify') %
(f, hex(n)))
return revisions, files