summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-09-22 02:18:11 +0200
committerStefan Metzmacher <metze@samba.org>2012-09-22 21:30:42 +0200
commitce22882df7e00b22a735539791806264424033a7 (patch)
treef1b1e0c62564ce3fffdae26fe550f934cec3b324
parenta68ab0e97e8dedc8298ca6502b1efc6ca2e32d66 (diff)
downloadsamba-ce22882df7e00b22a735539791806264424033a7.tar.gz
samba-ce22882df7e00b22a735539791806264424033a7.tar.bz2
samba-ce22882df7e00b22a735539791806264424033a7.zip
script/autobuild.py: use some variables for push_remote and push_branch
metze
-rwxr-xr-xscript/autobuild.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/script/autobuild.py b/script/autobuild.py
index 6e1de9e728..1fd0bf40b2 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -439,15 +439,20 @@ def rebase_tree(rebase_url, rebase_branch = "master"):
(rebase_remote, rebase_branch),
show=True, dir=test_master)
-def push_to(url):
- print("Pushing to %s" % url)
+def push_to(push_url, push_branch = "master"):
+ push_remote = "pushto"
+ print("Pushing to %s" % push_url)
if options.mark:
run_cmd("git config --replace-all core.editor script/commit_mark.sh", dir=test_master)
run_cmd("git commit --amend -c HEAD", dir=test_master)
# the notes method doesn't work yet, as metze hasn't allowed refs/notes/* in master
# run_cmd("EDITOR=script/commit_mark.sh git notes edit HEAD", dir=test_master)
- run_cmd("git remote add -t master pushto %s" % url, show=True, dir=test_master)
- run_cmd("git push pushto +HEAD:master", show=True, dir=test_master)
+ run_cmd("git remote add -t %s %s %s" %
+ (push_branch, push_remote, push_url),
+ show=True, dir=test_master)
+ run_cmd("git push %s +HEAD:%s" %
+ (push_remote, push_branch),
+ show=True, dir=test_master)
def_testbase = os.getenv("AUTOBUILD_TESTBASE", "/memdisk/%s" % os.getenv('USER'))