Mercurial > public > mercurial-scm > hg
diff mercurial/changegroup.py @ 29690:5684bc429e6a
discovery: move code to create outgoing from roots and heads
changegroup.changegroupsubset() contained somewhat low-level code for
constructing an "outgoing" instance from a list of roots and heads
nodes. It feels like discovery.py is a more appropriate location for
this code.
This code can definitely be optimized, as outgoing.missing will
recompute the set of changesets we've already discovered from
cl.between(). But code shouldn't be refactored during a move, so
I've simply inserted a TODO calling attention to that.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Wed, 03 Aug 2016 22:07:52 -0700 |
| parents | 953839de96ab |
| children | 4e7be6e33269 |
line wrap: on
line diff
--- a/mercurial/changegroup.py Wed Aug 03 16:23:26 2016 +0200 +++ b/mercurial/changegroup.py Wed Aug 03 22:07:52 2016 -0700 @@ -946,17 +946,7 @@ 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]) - # 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] - outgoing = discovery.outgoing(cl, discbases, heads) + outgoing = discovery.outgoingbetween(repo, roots, heads) bundler = getbundler(version, repo) return getsubset(repo, outgoing, bundler, source)