Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hg.py @ 17248:6ffb35b2284c stable
discovery: add extinct changesets to outgoing.excluded
Before this change, push would incorrectly fast-path the bundle
generation when extinct changesets are involved, because they are not
added to outgoing.excluded. The reason to do so are related to
outgoing.excluded being assumed to contain only secret changesets by
scmutil.nochangesfound(), when displaying warnings like:
changes found (ignored 9 secret changesets)
Still, outgoing.excluded seems like a good API to report the extinct
changesets instead of dedicated code and nothing in the docstring
indicates it to be bound to secret changesets. This patch adds extinct
changesets to outgoing.excluded and fixes scmutil.nochangesfound() to
filter the excluded node list.
Original version and test by Pierre-Yves.David@ens-lyon.org
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Wed, 25 Jul 2012 19:34:31 +0200 |
| parents | ecde35a1af9e |
| children | 471f30d360ea |
comparison
equal
deleted
inserted
replaced
| 17247:6d51a0c71d4e | 17248:6ffb35b2284c |
|---|---|
| 523 other = peer(repo, opts, dest) | 523 other = peer(repo, opts, dest) |
| 524 outgoing = discovery.findcommonoutgoing(repo, other, revs, | 524 outgoing = discovery.findcommonoutgoing(repo, other, revs, |
| 525 force=opts.get('force')) | 525 force=opts.get('force')) |
| 526 o = outgoing.missing | 526 o = outgoing.missing |
| 527 if not o: | 527 if not o: |
| 528 scmutil.nochangesfound(repo.ui, outgoing.excluded) | 528 scmutil.nochangesfound(repo.ui, repo, outgoing.excluded) |
| 529 return None | 529 return None |
| 530 return o | 530 return o |
| 531 | 531 |
| 532 def outgoing(ui, repo, dest, opts): | 532 def outgoing(ui, repo, dest, opts): |
| 533 def recurse(): | 533 def recurse(): |