##// END OF EJS Templates
parseurl: consistently call second output "branches"...
Martin von Zweigbergk -
r37278:3809eafe default
parent child Browse files
Show More
@@ -899,10 +899,10 b' def findoutgoing(ui, repo, remote=None, '
899 899 if opts is None:
900 900 opts = {}
901 901 dest = ui.expandpath(remote or 'default-push', remote or 'default')
902 dest, revs = hg.parseurl(dest, None)[:2]
902 dest, branches = hg.parseurl(dest, None)[:2]
903 903 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
904 904
905 revs, checkout = hg.addbranchrevs(repo, repo, revs, None)
905 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
906 906 other = hg.peer(repo, opts, dest)
907 907
908 908 if revs:
@@ -530,13 +530,13 b' def clone(ui, peeropts, source, dest=Non'
530 530
531 531 if isinstance(source, bytes):
532 532 origsource = ui.expandpath(source)
533 source, branch = parseurl(origsource, branch)
533 source, branches = parseurl(origsource, branch)
534 534 srcpeer = peer(ui, peeropts, source)
535 535 else:
536 536 srcpeer = source.peer() # in case we were called with a localrepo
537 branch = (None, branch or [])
537 branches = (None, branch or [])
538 538 origsource = source = srcpeer.url()
539 rev, checkout = addbranchrevs(srcpeer, srcpeer, branch, rev)
539 rev, checkout = addbranchrevs(srcpeer, srcpeer, branches, rev)
540 540
541 541 if dest is None:
542 542 dest = defaultdest(source)
General Comments 0
You need to be logged in to leave comments. Login now