# HG changeset patch # User Martin von Zweigbergk # Date 2018-04-01 22:41:16 # Node ID 3809eafedf2c6ed67fef09de8f8b66b7c93328b2 # Parent 8e57c3b0dce4fe33aec215d1ad53a4f1320a0afc parseurl: consistently call second output "branches" Differential Revision: https://phab.mercurial-scm.org/D3015 diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -899,10 +899,10 @@ def findoutgoing(ui, repo, remote=None, 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: diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -530,13 +530,13 @@ def clone(ui, peeropts, source, dest=Non 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)