equal
deleted
inserted
replaced
1049 |
1049 |
1050 Used by initialization code""" |
1050 Used by initialization code""" |
1051 if opts is None: |
1051 if opts is None: |
1052 opts = {} |
1052 opts = {} |
1053 path = urlutil.get_unique_push_path(b'histedit', repo, ui, remote) |
1053 path = urlutil.get_unique_push_path(b'histedit', repo, ui, remote) |
1054 dest = path.loc |
1054 |
1055 |
1055 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(path.loc)) |
1056 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest)) |
|
1057 |
1056 |
1058 revs, checkout = hg.addbranchrevs(repo, repo, (path.branch, []), None) |
1057 revs, checkout = hg.addbranchrevs(repo, repo, (path.branch, []), None) |
1059 other = hg.peer(repo, opts, dest) |
1058 other = hg.peer(repo, opts, path) |
1060 |
1059 |
1061 if revs: |
1060 if revs: |
1062 revs = [repo.lookup(rev) for rev in revs] |
1061 revs = [repo.lookup(rev) for rev in revs] |
1063 |
1062 |
1064 outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force) |
1063 outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force) |