opendev/git-restack
Code Issues Proposed changes

Don't hardcode 'master'

Browse Source 
Was hardcoded in:
* checking whether fetching is set up for the remote
* checking whether the topic of a downloaded change is bogus

(amended to pass pep8)

Change-Id: If9a4cd5c76829d69f1b3ee871a25966e5aaaa126
This commit is contained in:
Catrope
2012-01-22 07:29:40 +01:00
parent 6628889d81
commit 360156f152
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
git-review
View File

@@ -277,7 +277,7 @@ def check_color_support():
return _has_color return _has_color
def check_remote(remote): def check_remote(branch, remote):
"""Check that a Gerrit Git remote repo exists, if not, set one.""" """Check that a Gerrit Git remote repo exists, if not, set one."""
has_color = check_color_support() has_color = check_color_support()
@@ -290,7 +290,7 @@ def check_remote(remote):
remotes = run_command("git branch -a %s" % color_never).split("\n") remotes = run_command("git branch -a %s" % color_never).split("\n")
for current_remote in remotes: for current_remote in remotes:
if current_remote.strip() == "remotes/%s/master" % (remote) \ if current_remote.strip() == "remotes/%s/%s" % (remote, branch) \
and not UPDATE: and not UPDATE:
return return
# We have the remote, but aren't set up to fetch. Fix it # We have the remote, but aren't set up to fetch. Fix it
@@ -433,7 +433,7 @@ def get_topic(target_branch):
return branch_name return branch_name
def download_review(review): def download_review(review, masterbranch):
(hostname, team, username, port, project_name) = \ (hostname, team, username, port, project_name) = \
parse_git_show("gerrit", "Push") parse_git_show("gerrit", "Push")
@@ -464,7 +464,7 @@ def download_review(review):
try: try:
topic = review_info['topic'] topic = review_info['topic']
if topic == "master": if topic == masterbranch:
topic = review topic = review
except KeyError: except KeyError:
topic = review topic = review
@@ -593,10 +593,11 @@ def main():
status = 0 status = 0
needs_update = latest_is_newer() needs_update = latest_is_newer()
check_remote(remote) check_remote(branch, remote)
if options.download is not None: if options.download is not None:
print_exit_message(download_review(options.download), needs_update) print_exit_message(download_review(options.download, branch),
needs_update)
else: else:
topic = options.topic topic = options.topic
if topic is None: if topic is None: