equal
deleted
inserted
replaced
277 |
277 |
278 check_unsupported_flags(opts) |
278 check_unsupported_flags(opts) |
279 dest = ui.expandpath(dest or 'default-push', dest or 'default') |
279 dest = ui.expandpath(dest or 'default-push', dest or 'default') |
280 dest, branches = hg.parseurl(dest, opts.get('branch')) |
280 dest, branches = hg.parseurl(dest, opts.get('branch')) |
281 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
281 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
282 other = hg.repository(cmdutil.remoteui(ui, opts), dest) |
282 other = hg.repository(hg.remoteui(ui, opts), dest) |
283 if revs: |
283 if revs: |
284 revs = [repo.lookup(rev) for rev in revs] |
284 revs = [repo.lookup(rev) for rev in revs] |
285 ui.status(_('comparing with %s\n') % url.hidepassword(dest)) |
285 ui.status(_('comparing with %s\n') % url.hidepassword(dest)) |
286 o = repo.findoutgoing(other, force=opts.get('force')) |
286 o = repo.findoutgoing(other, force=opts.get('force')) |
287 if not o: |
287 if not o: |
304 directory. |
304 directory. |
305 """ |
305 """ |
306 |
306 |
307 check_unsupported_flags(opts) |
307 check_unsupported_flags(opts) |
308 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
308 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
309 other = hg.repository(cmdutil.remoteui(repo, opts), source) |
309 other = hg.repository(hg.remoteui(repo, opts), source) |
310 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) |
310 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) |
311 ui.status(_('comparing with %s\n') % url.hidepassword(source)) |
311 ui.status(_('comparing with %s\n') % url.hidepassword(source)) |
312 if revs: |
312 if revs: |
313 revs = [other.lookup(rev) for rev in revs] |
313 revs = [other.lookup(rev) for rev in revs] |
314 incoming = repo.findincoming(other, heads=revs, force=opts["force"]) |
314 incoming = repo.findincoming(other, heads=revs, force=opts["force"]) |