From 3659abb0695d01defa95b61d6902dfa5248d70bd Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 13 Apr 2012 14:02:40 -0700 Subject: [PATCH] Removed parsing out of team. Fixes bug 980929. We were making an assumption of a multi-level project, which not everyone has. Additionally, we parsed out the "team" name and then just flat-out didn't use it at all. Go us. Change-Id: I96269a670bcec95fff63de85c75cb241946eba99 --- git-review | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/git-review b/git-review index dc695d4..6b61ae2 100755 --- a/git-review +++ b/git-review @@ -118,7 +118,7 @@ def set_hooks_commit_msg(remote, target_file): if not os.path.isdir(hooks_dir): os.mkdir(hooks_dir) - (hostname, team, username, port, project_name) = \ + (hostname, username, port, project_name) = \ parse_git_show(remote, "Push") if not os.path.exists(target_file) or UPDATE: @@ -224,7 +224,6 @@ def parse_git_show(remote, verb): project_name = project_name[:-4] hostname = parsed_url.netloc - team = None username = None port = parsed_url.port @@ -244,11 +243,7 @@ def parse_git_show(remote, verb): if parsed_url.scheme == "ssh" and port == None: port = 22 - team = project_name.split("/")[-2] - if team.startswith("git@github.com"): - team = team.split(':')[1] - - return (hostname, team, username, str(port), project_name) + return (hostname, username, str(port), project_name) def git_config_get_value(section, option): @@ -443,7 +438,7 @@ def get_topic(target_branch): def download_review(review, masterbranch, remote): - (hostname, team, username, port, project_name) = \ + (hostname, username, port, project_name) = \ parse_git_show(remote, "Push") ssh_cmds = ["ssh"]