upload: Support uploading to Gerrit over https://
If SSH is not available, Gerrit returns NOT_AVAILABLE to the /ssh_info
query made by repo upload. In this case fallback to the /p/$PROJECT URL
that Gerrit also exports and use that for uploads.
Change-Id: I1e3e39ab709ecc0a692614a41a42446426f39c08
diff --git a/git_config.py b/git_config.py
index a52677c..1793764 100644
--- a/git_config.py
+++ b/git_config.py
@@ -527,7 +527,7 @@
self.projectname = self._Get('projectname')
self.fetch = map(lambda x: RefSpec.FromString(x),
self._Get('fetch', all=True))
- self._review_protocol = None
+ self._review_url = None
def _InsteadOf(self):
globCfg = GitConfig.ForUser()
@@ -554,9 +554,8 @@
connectionUrl = self._InsteadOf()
return _preconnect(connectionUrl)
- @property
- def ReviewProtocol(self):
- if self._review_protocol is None:
+ def ReviewUrl(self, userEmail):
+ if self._review_url is None:
if self.review is None:
return None
@@ -565,67 +564,47 @@
u = 'http://%s' % u
if u.endswith('/Gerrit'):
u = u[:len(u) - len('/Gerrit')]
- if not u.endswith('/ssh_info'):
- if not u.endswith('/'):
- u += '/'
- u += 'ssh_info'
+ if u.endswith('/ssh_info'):
+ u = u[:len(u) - len('/ssh_info')]
+ if not u.endswith('/'):
+ u += '/'
+ http_url = u
if u in REVIEW_CACHE:
- info = REVIEW_CACHE[u]
- self._review_protocol = info[0]
- self._review_host = info[1]
- self._review_port = info[2]
+ self._review_url = REVIEW_CACHE[u]
elif 'REPO_HOST_PORT_INFO' in os.environ:
- info = os.environ['REPO_HOST_PORT_INFO']
- self._review_protocol = 'ssh'
- self._review_host = info.split(" ")[0]
- self._review_port = info.split(" ")[1]
-
- REVIEW_CACHE[u] = (
- self._review_protocol,
- self._review_host,
- self._review_port)
+ host, port = os.environ['REPO_HOST_PORT_INFO'].split()
+ self._review_url = self._SshReviewUrl(userEmail, host, port)
+ REVIEW_CACHE[u] = self._review_url
else:
try:
- info = urllib2.urlopen(u).read()
- if info == 'NOT_AVAILABLE':
- raise UploadError('%s: SSH disabled' % self.review)
+ info_url = u + 'ssh_info'
+ info = urllib2.urlopen(info_url).read()
if '<' in info:
# Assume the server gave us some sort of HTML
# response back, like maybe a login page.
#
- raise UploadError('%s: Cannot parse response' % u)
+ raise UploadError('%s: Cannot parse response' % info_url)
- self._review_protocol = 'ssh'
- self._review_host = info.split(" ")[0]
- self._review_port = info.split(" ")[1]
- except urllib2.HTTPError, e:
- if e.code == 404:
- self._review_protocol = 'http-post'
- self._review_host = None
- self._review_port = None
+ if info == 'NOT_AVAILABLE':
+ # Assume HTTP if SSH is not enabled.
+ self._review_url = http_url + 'p/'
else:
- raise UploadError('Upload over SSH unavailable')
+ host, port = info.split()
+ self._review_url = self._SshReviewUrl(userEmail, host, port)
+ except urllib2.HTTPError, e:
+ raise UploadError('%s: %s' % (self.review, str(e)))
except urllib2.URLError, e:
raise UploadError('%s: %s' % (self.review, str(e)))
- REVIEW_CACHE[u] = (
- self._review_protocol,
- self._review_host,
- self._review_port)
- return self._review_protocol
+ REVIEW_CACHE[u] = self._review_url
+ return self._review_url + self.projectname
- def SshReviewUrl(self, userEmail):
- if self.ReviewProtocol != 'ssh':
- return None
+ def _SshReviewUrl(self, userEmail, host, port):
username = self._config.GetString('review.%s.username' % self.review)
if username is None:
- username = userEmail.split("@")[0]
- return 'ssh://%s@%s:%s/%s' % (
- username,
- self._review_host,
- self._review_port,
- self.projectname)
+ username = userEmail.split('@')[0]
+ return 'ssh://%s@%s:%s/' % (username, host, port)
def ToLocal(self, rev):
"""Convert a remote revision string to something we have locally.
diff --git a/project.py b/project.py
index 8b9a3fc..f48472b 100644
--- a/project.py
+++ b/project.py
@@ -866,31 +866,30 @@
branch.remote.projectname = self.name
branch.remote.Save()
- if branch.remote.ReviewProtocol == 'ssh':
- if dest_branch.startswith(R_HEADS):
- dest_branch = dest_branch[len(R_HEADS):]
+ url = branch.remote.ReviewUrl(self.UserEmail)
+ if url is None:
+ raise UploadError('review not configured')
+ cmd = ['push']
+ if url.startswith('ssh://'):
rp = ['gerrit receive-pack']
for e in people[0]:
rp.append('--reviewer=%s' % sq(e))
for e in people[1]:
rp.append('--cc=%s' % sq(e))
-
- ref_spec = '%s:refs/for/%s' % (R_HEADS + branch.name, dest_branch)
- if auto_topic:
- ref_spec = ref_spec + '/' + branch.name
-
- cmd = ['push']
cmd.append('--receive-pack=%s' % " ".join(rp))
- cmd.append(branch.remote.SshReviewUrl(self.UserEmail))
- cmd.append(ref_spec)
- if GitCommand(self, cmd, bare = True).Wait() != 0:
- raise UploadError('Upload failed')
+ cmd.append(url)
- else:
- raise UploadError('Unsupported protocol %s' \
- % branch.remote.review)
+ if dest_branch.startswith(R_HEADS):
+ dest_branch = dest_branch[len(R_HEADS):]
+ ref_spec = '%s:refs/for/%s' % (R_HEADS + branch.name, dest_branch)
+ if auto_topic:
+ ref_spec = ref_spec + '/' + branch.name
+ cmd.append(ref_spec)
+
+ if GitCommand(self, cmd, bare = True).Wait() != 0:
+ raise UploadError('Upload failed')
msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
self.bare_git.UpdateRef(R_PUB + branch.name,
