opendev/git-review
Code Issues Proposed changes

Add http(s) protocol support to test_remote

Browse Source 
Change-Id: I517b68dd9b949033bad9d422d55b9037409793b2
This commit is contained in:
Cedric Brandily 2014-02-03 23:21:11 +01:00 committed by Gerrit Code Review
parent 9a7f8ad613
commit 7da9835ba5
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
git_review/cmd.py
View File

@ -247,29 +247,16 @@ def set_hooks_commit_msg(remote, target_file):
os.chmod(target_file, os.path.stat.S_IREAD | os.path.stat.S_IEXEC)
def test_remote(username, hostname, port, project):
"""Tests that a possible gerrit remote works."""
if port is not None:
port = "-p %s" % port
else:
port = ""
if username is None:
userhost = hostname
else:
userhost = "%s@%s" % (username, hostname)
(status, ssh_output) = run_command_status(
"ssh", "-x", port, userhost,
"gerrit", "ls-projects")
def test_remote_url(remote_url):
"""Tests that a possible gerrit remote url works."""
status, __ = run_command_status("git", "push", "--dry-run", remote_url)
if status == 0:
if VERBOSE:
print("%s@%s:%s worked." % (username, hostname, port))
print("%s worked." % remote_url)
return True
else:
if VERBOSE:
print("%s@%s:%s did not work." % (username, hostname, port))
print("%s did not work." % remote_url)
return False
@ -296,12 +283,12 @@ def add_remote(hostname, port, project, remote):
remote_url = make_remote_url(username, hostname, port, project)
if VERBOSE:
print("No remote set, testing %s" % remote_url)
if not test_remote(username, hostname, port, project):
if not test_remote_url(remote_url):
print("Could not connect to gerrit.")
username = do_input("Enter your gerrit username: ")
remote_url = make_remote_url(username, hostname, port, project)
print("Trying again with %s" % remote_url)
if not test_remote(username, hostname, port, project):
if not test_remote_url(remote_url):
raise Exception("Could not connect to gerrit at %s" % remote_url)
asked_for_username = True