Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 16746:9acb5cd19162
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 17 May 2012 15:52:14 -0500 |
parents | 3e6d59ae4dc2 025b3b763ba9 |
children | d064da05590d |
comparison
equal
deleted
inserted
replaced
16745:27b2e1823e83 | 16746:9acb5cd19162 |
---|---|
1043 other = hg.peer(repo, opts, dest) | 1043 other = hg.peer(repo, opts, dest) |
1044 revs, checkout = hg.addbranchrevs(repo, other, branches, revs) | 1044 revs, checkout = hg.addbranchrevs(repo, other, branches, revs) |
1045 heads = revs and map(repo.lookup, revs) or revs | 1045 heads = revs and map(repo.lookup, revs) or revs |
1046 outgoing = discovery.findcommonoutgoing(repo, other, | 1046 outgoing = discovery.findcommonoutgoing(repo, other, |
1047 onlyheads=heads, | 1047 onlyheads=heads, |
1048 force=opts.get('force')) | 1048 force=opts.get('force'), |
1049 portable=True) | |
1049 cg = repo.getlocalbundle('bundle', outgoing) | 1050 cg = repo.getlocalbundle('bundle', outgoing) |
1050 if not cg: | 1051 if not cg: |
1051 scmutil.nochangesfound(ui, outgoing and outgoing.excluded) | 1052 scmutil.nochangesfound(ui, outgoing and outgoing.excluded) |
1052 return 1 | 1053 return 1 |
1053 | 1054 |