Support Gerrit2's ssh:// based upload

In Gerrit2 uploads are sent over "git push ssh://...", as this
is a more efficient transport and is easier to code from external
scripts and/or direct command line usage by an end-user.

Gerrit1's HTTP POST based format is assumed if the review server
does not have the /ssh_info URL available on it.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2009-01-05 16:18:58 -08:00
parent 21f7385400
commit b54a392c9a
2 changed files with 91 additions and 24 deletions

View File

@ -16,7 +16,8 @@
import os import os
import re import re
import sys import sys
from error import GitError from urllib2 import urlopen, HTTPError
from error import GitError, UploadError
from git_command import GitCommand from git_command import GitCommand
R_HEADS = 'refs/heads/' R_HEADS = 'refs/heads/'
@ -261,6 +262,45 @@ class Remote(object):
self.projectname = self._Get('projectname') self.projectname = self._Get('projectname')
self.fetch = map(lambda x: RefSpec.FromString(x), self.fetch = map(lambda x: RefSpec.FromString(x),
self._Get('fetch', all=True)) self._Get('fetch', all=True))
self._review_protocol = None
@property
def ReviewProtocol(self):
if self._review_protocol is None:
if self.review is None:
return None
u = self.review
if not u.startswith('http:') and not u.startswith('https:'):
u = 'http://%s' % u
if not u.endswith('/'):
u += '/'
u += 'ssh_info'
try:
info = urlopen(u).read()
if info == 'NOT_AVAILABLE':
raise UploadError('Upload over ssh unavailable')
self._review_protocol = 'ssh'
self._review_host = info.split(" ")[0]
self._review_port = info.split(" ")[1]
except HTTPError, e:
if e.code == 404:
self._review_protocol = 'http-post'
else:
raise UploadError('Cannot guess Gerrit version')
return self._review_protocol
def SshReviewUrl(self, userEmail):
if self.ReviewProtocol != 'ssh':
return None
return 'ssh://%s@%s:%s/%s' % (
userEmail.split("@")[0],
self._review_host,
self._review_port,
self.projectname)
def ToLocal(self, rev): def ToLocal(self, rev):
"""Convert a remote revision string to something we have locally. """Convert a remote revision string to something we have locally.

View File

@ -46,6 +46,8 @@ def _info(fmt, *args):
def not_rev(r): def not_rev(r):
return '^' + r return '^' + r
def sq(r):
return "'" + r.replace("'", "'\''") + "'"
hook_list = None hook_list = None
def repo_hooks(): def repo_hooks():
@ -475,6 +477,11 @@ class Project(object):
if not dest_branch.startswith(R_HEADS): if not dest_branch.startswith(R_HEADS):
dest_branch = R_HEADS + dest_branch dest_branch = R_HEADS + dest_branch
if not branch.remote.projectname:
branch.remote.projectname = self.name
branch.remote.Save()
if branch.remote.ReviewProtocol == 'http-post':
base_list = [] base_list = []
for name, id in self._allrefs.iteritems(): for name, id in self._allrefs.iteritems():
if branch.remote.WritesTo(name): if branch.remote.WritesTo(name):
@ -482,10 +489,6 @@ class Project(object):
if not base_list: if not base_list:
raise GitError('no base refs, cannot upload %s' % branch.name) raise GitError('no base refs, cannot upload %s' % branch.name)
if not branch.remote.projectname:
branch.remote.projectname = self.name
branch.remote.Save()
print >>sys.stderr, '' print >>sys.stderr, ''
_info("Uploading %s to %s:", branch.name, self.name) _info("Uploading %s to %s:", branch.name, self.name)
try: try:
@ -503,6 +506,30 @@ class Project(object):
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
raise UploadError('HTTP error %d' % e.code) raise UploadError('HTTP error %d' % e.code)
elif branch.remote.ReviewProtocol == 'ssh':
if dest_branch.startswith(R_HEADS):
dest_branch = dest_branch[len(R_HEADS):]
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))
cmd = ['push']
cmd.append('--receive-pack=%s' % " ".join(rp))
cmd.append(branch.remote.SshReviewUrl(self.UserEmail))
cmd.append('%s:refs/for/%s' % (R_HEADS + branch.name, dest_branch))
if replace_changes:
for change_id,commit_id in replace_changes.iteritems():
cmd.append('%s:refs/changes/%s/new' % (commit_id, change_id))
if GitCommand(self, cmd, bare = True).Wait() != 0:
raise UploadError('Upload failed')
else:
raise UploadError('Unsupported protocol %s' \
% branch.remote.review)
msg = "posted to %s for %s" % (branch.remote.review, dest_branch) msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
self.bare_git.UpdateRef(R_PUB + branch.name, self.bare_git.UpdateRef(R_PUB + branch.name,
R_HEADS + branch.name, R_HEADS + branch.name,