Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.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 | b8661d7c940f |
| children | 3e856d8abe9c |
comparison
equal
deleted
inserted
replaced
| 17247:6d51a0c71d4e | 17248:6ffb35b2284c |
|---|---|
| 1048 onlyheads=heads, | 1048 onlyheads=heads, |
| 1049 force=opts.get('force'), | 1049 force=opts.get('force'), |
| 1050 portable=True) | 1050 portable=True) |
| 1051 cg = repo.getlocalbundle('bundle', outgoing) | 1051 cg = repo.getlocalbundle('bundle', outgoing) |
| 1052 if not cg: | 1052 if not cg: |
| 1053 scmutil.nochangesfound(ui, outgoing and outgoing.excluded) | 1053 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded) |
| 1054 return 1 | 1054 return 1 |
| 1055 | 1055 |
| 1056 changegroup.writebundle(cg, fname, bundletype) | 1056 changegroup.writebundle(cg, fname, bundletype) |
| 1057 | 1057 |
| 1058 @command('cat', | 1058 @command('cat', |