Show More
@@ -869,7 +869,7 b' def _outgoing(ui, repo, dest, opts):' | |||||
869 | revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)] |
|
869 | revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)] | |
870 |
|
870 | |||
871 | other = peer(repo, opts, dest) |
|
871 | other = peer(repo, opts, dest) | |
872 |
outgoing = discovery.findcommonoutgoing(repo |
|
872 | outgoing = discovery.findcommonoutgoing(repo, other, revs, | |
873 | force=opts.get('force')) |
|
873 | force=opts.get('force')) | |
874 | o = outgoing.missing |
|
874 | o = outgoing.missing | |
875 | if not o: |
|
875 | if not o: |
@@ -120,10 +120,6 b' def nochangesfound(ui, repo, excluded=No' | |||||
120 | secretlist = [] |
|
120 | secretlist = [] | |
121 | if excluded: |
|
121 | if excluded: | |
122 | for n in excluded: |
|
122 | for n in excluded: | |
123 | if n not in repo: |
|
|||
124 | # discovery should not have included the filtered revision, |
|
|||
125 | # we have to explicitly exclude it until discovery is cleanup. |
|
|||
126 | continue |
|
|||
127 | ctx = repo[n] |
|
123 | ctx = repo[n] | |
128 | if ctx.phase() >= phases.secret and not ctx.extinct(): |
|
124 | if ctx.phase() >= phases.secret and not ctx.extinct(): | |
129 | secretlist.append(n) |
|
125 | secretlist.append(n) |
General Comments 0
You need to be logged in to leave comments.
Login now