mercurial-scm/hg-stable: mercurial/localrepo.py comparison

comparison mercurial/localrepo.py @ 13703:48d606d7192b

changegroupsubset: extranodes are no longer needed

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date	Sun, 20 Mar 2011 01:16:57 +0100
parents	80d6e1f63ed9
children	7beb9834d185

comparison

equal deleted inserted replaced

-:ffd370aa050b
+:48d606d7192b
 if self.ui.debugflag:
 self.ui.debug("list of changesets:\n")
 for node in nodes:
 self.ui.debug("%s\n" % hex(node))
-def changegroupsubset(self, bases, heads, source, extranodes=None):
+def changegroupsubset(self, bases, heads, source):
 """Compute a changegroup consisting of all the nodes that are
 descendents of any of the bases and ancestors of any of the heads.
 Return a chunkbuffer object whose read() method will return
 successive changegroup chunks.
 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.
-The caller can specify some nodes that must be included in the
-changegroup using the extranodes argument.  It should be a dict
-where the keys are the filenames (or 1 for the manifest), and the
-values are lists of (node, linknode) tuples, where node is a wanted
-node and linknode is the changelog node that should be transmitted as
-the linkrev.
 """
 # Set up some initial variables
 # Make it easy to refer to self.changelog
 cl = self.changelog
 # necessary to re-create the changegroup.
 if not bases:
 bases = [nullid]
 msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads)
-if extranodes is None:
+# can we go through the fast path ?
-# can we go through the fast path ?
+heads.sort()
-heads.sort()
+allheads = self.heads()
-allheads = self.heads()
+allheads.sort()
-allheads.sort()
+if heads == allheads:
-if heads == allheads:
+return self._changegroup(msng_cl_lst, source)
-return self._changegroup(msng_cl_lst, source)
 # slow path
 self.hook('preoutgoing', throw=True, source=source)
 self.changegroupinfo(msng_cl_lst, source)
 for n in hasset:
 missingnodes.pop(n, None)
 for r in revlog.ancestors(*[revlog.rev(n) for n in hasset]):
 missingnodes.pop(revlog.node(r), None)
-# Add the nodes that were explicitly requested.
-def add_extra_nodes(name, nodes):
-if not extranodes or name not in extranodes:
-return
-for node, linknode in extranodes[name]:
-if node not in nodes:
-nodes[node] = linknode
 # Now that we have all theses utility functions to help out and
 # logically divide up the task, generate the group.
 def gengroup():
 # The set of changed files starts empty.
 changedfiles = set()
 unit=_('changesets'))
 changecount = cnt / 3
 self.ui.progress(_('bundling'), None)
 prune(mnfst, msng_mnfst_set)
-add_extra_nodes(1, msng_mnfst_set)
 msng_mnfst_lst = msng_mnfst_set.keys()
 # Sort the manifestnodes by revision number.
 msng_mnfst_lst.sort(key=mnfst.rev)
 # Create a generator for the manifestnodes that calls our lookup
 # and data collection functions back.
 # These are no longer needed, dereference and toss the memory for
 # them.
 msng_mnfst_lst = None
 msng_mnfst_set.clear()
-if extranodes:
-for fname in extranodes:
-if isinstance(fname, int):
-continue
-msng_filenode_set.setdefault(fname, {})
-changedfiles.add(fname)
 # Go through all our files in order sorted by name.
 for idx, fname in enumerate(sorted(changedfiles)):
 filerevlog = self.file(fname)
 if not len(filerevlog):
 raise util.Abort(_("empty or missing revlog for %s") % fname)
 # Toss out the filenodes that the recipient isn't really
 # missing.
 missingfnodes = msng_filenode_set.pop(fname, {})
 prune(filerevlog, missingfnodes)
-add_extra_nodes(fname, missingfnodes)
 # If any filenodes are left, generate the group for them,
 # otherwise don't bother.
 if missingfnodes:
 yield changegroup.chunkheader(len(fname))
 yield fname

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 13703:48d606d7192b