You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by uw...@apache.org on 2018/07/23 16:05:07 UTC
[arrow] branch master updated: ARROW-2876: [Packaging] Replace
ssh-URLs with https://
This is an automated email from the ASF dual-hosted git repository.
uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 13c103a ARROW-2876: [Packaging] Replace ssh-URLs with https://
13c103a is described below
commit 13c103ad462f9606f584e677722801df9f714eca
Author: Korn, Uwe <Uw...@blue-yonder.com>
AuthorDate: Mon Jul 23 18:05:00 2018 +0200
ARROW-2876: [Packaging] Replace ssh-URLs with https://
Author: Korn, Uwe <Uw...@blue-yonder.com>
Closes #2306 from xhochy/ARROW-2876 and squashes the following commits:
a4b65ab1 <Korn, Uwe> ARROW-2876: Replace ssh-URLs with https://
---
dev/tasks/crossbow.py | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/dev/tasks/crossbow.py b/dev/tasks/crossbow.py
index b4f8258..7a36cc7 100755
--- a/dev/tasks/crossbow.py
+++ b/dev/tasks/crossbow.py
@@ -85,7 +85,7 @@ class Repo:
Commit: {head}
''')
return tpl.format(
- remote=self.remote.url,
+ remote=self.remote_url,
branch=self.branch.branch_name,
head=self.head
)
@@ -119,6 +119,16 @@ class Repo:
return self.repo.remotes[self.branch.upstream.remote_name]
@property
+ def remote_url(self):
+ """
+ Currently checked out branch's remote counterpart URL
+
+ If an SSH github url is set, it will be replaced by the https
+ equivalent.
+ """
+ return self.remote.url.replace('git@github.com:', 'https://github.com/')
+
+ @property
def email(self):
return next(self.repo.config.get_multivar('user.email'))
@@ -169,7 +179,7 @@ class Repo:
return blob.data
def _parse_github_user_repo(self):
- m = re.match('.*\/([^\/]+)\/([^\/\.]+)(\.git)?$', self.remote.url)
+ m = re.match('.*\/([^\/]+)\/([^\/\.]+)(\.git)?$', self.remote_url)
user, repo = m.group(1), m.group(2)
return user, repo
@@ -287,7 +297,7 @@ class Target:
return cls(head=str(repo.head.target),
email=repo.email,
branch=repo.branch.branch_name,
- remote=repo.remote.url,
+ remote=repo.remote_url,
version=version)