Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 15837:cd956049fc14
discovery: introduce outgoing object for result of findcommonoutgoing
Simplifies client logic in multiple places since it encapsulates the
computation of the common and, more importantly, the missing node lists.
This also allows an upcomping patch to communicate precomputed versions of
these lists to clients.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Mon, 09 Jan 2012 03:47:16 +0100 |
| parents | 926c9ee8d4be |
| children | 513ca86b88ef |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Jan 09 04:16:00 2012 +0100 +++ b/mercurial/commands.py Mon Jan 09 03:47:16 2012 +0100 @@ -977,18 +977,18 @@ raise util.Abort(_("--base is incompatible with specifying " "a destination")) common = [repo.lookup(rev) for rev in base] - outheads = revs and map(repo.lookup, revs) or revs + heads = revs and map(repo.lookup, revs) or revs + cg = repo.getbundle('bundle', heads=heads, common=common) else: dest = ui.expandpath(dest or 'default-push', dest or 'default') dest, branches = hg.parseurl(dest, opts.get('branch')) other = hg.peer(repo, opts, dest) revs, checkout = hg.addbranchrevs(repo, other, branches, revs) heads = revs and map(repo.lookup, revs) or revs - common, outheads = discovery.findcommonoutgoing(repo, other, - onlyheads=heads, - force=opts.get('force')) - - cg = repo.getbundle('bundle', common=common, heads=outheads) + outgoing = discovery.findcommonoutgoing(repo, other, + onlyheads=heads, + force=opts.get('force')) + cg = repo.getlocalbundle('bundle', outgoing) if not cg: ui.status(_("no changes found\n")) return 1 @@ -5436,10 +5436,10 @@ commoninc = None ui.debug('comparing with %s\n' % util.hidepassword(dest)) repo.ui.pushbuffer() - common, outheads = discovery.findcommonoutgoing(repo, other, - commoninc=commoninc) + outgoing = discovery.findcommonoutgoing(repo, other, + commoninc=commoninc) repo.ui.popbuffer() - o = repo.changelog.findmissing(common=common, heads=outheads) + o = outgoing.missing if o: t.append(_('%d outgoing') % len(o)) if 'bookmarks' in other.listkeys('namespaces'):