Mercurial > hg-stable
changeset 37263:3809eafedf2c
parseurl: consistently call second output "branches"
Differential Revision: https://phab.mercurial-scm.org/D3015
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 01 Apr 2018 15:41:16 -0700 |
| parents | 8e57c3b0dce4 |
| children | 54435fd09f1d |
| files | hgext/histedit.py mercurial/hg.py |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Sun Apr 01 11:06:29 2018 +0900 +++ b/hgext/histedit.py Sun Apr 01 15:41:16 2018 -0700 @@ -899,10 +899,10 @@ if opts is None: opts = {} dest = ui.expandpath(remote or 'default-push', remote or 'default') - dest, revs = hg.parseurl(dest, None)[:2] + dest, branches = hg.parseurl(dest, None)[:2] ui.status(_('comparing with %s\n') % util.hidepassword(dest)) - revs, checkout = hg.addbranchrevs(repo, repo, revs, None) + revs, checkout = hg.addbranchrevs(repo, repo, branches, None) other = hg.peer(repo, opts, dest) if revs:
--- a/mercurial/hg.py Sun Apr 01 11:06:29 2018 +0900 +++ b/mercurial/hg.py Sun Apr 01 15:41:16 2018 -0700 @@ -530,13 +530,13 @@ if isinstance(source, bytes): origsource = ui.expandpath(source) - source, branch = parseurl(origsource, branch) + source, branches = parseurl(origsource, branch) srcpeer = peer(ui, peeropts, source) else: srcpeer = source.peer() # in case we were called with a localrepo - branch = (None, branch or []) + branches = (None, branch or []) origsource = source = srcpeer.url() - rev, checkout = addbranchrevs(srcpeer, srcpeer, branch, rev) + rev, checkout = addbranchrevs(srcpeer, srcpeer, branches, rev) if dest is None: dest = defaultdest(source)