equal
deleted
inserted
replaced
1222 |
1222 |
1223 if base: |
1223 if base: |
1224 if dest: |
1224 if dest: |
1225 raise error.Abort(_("--base is incompatible with specifying " |
1225 raise error.Abort(_("--base is incompatible with specifying " |
1226 "a destination")) |
1226 "a destination")) |
1227 common = [repo.lookup(rev) for rev in base] |
1227 common = [repo[rev].node() for rev in base] |
1228 heads = [repo.lookup(r) for r in revs] if revs else None |
1228 heads = [repo[r].node() for r in revs] if revs else None |
1229 outgoing = discovery.outgoing(repo, common, heads) |
1229 outgoing = discovery.outgoing(repo, common, heads) |
1230 else: |
1230 else: |
1231 dest = ui.expandpath(dest or 'default-push', dest or 'default') |
1231 dest = ui.expandpath(dest or 'default-push', dest or 'default') |
1232 dest, branches = hg.parseurl(dest, opts.get('branch')) |
1232 dest, branches = hg.parseurl(dest, opts.get('branch')) |
1233 other = hg.peer(repo, opts, dest) |
1233 other = hg.peer(repo, opts, dest) |