Commit 48e666d8 authored by Daniel Smith's avatar Daniel Smith

Add function param defaults

parent 909d6a34
...@@ -588,12 +588,12 @@ def fetchChange(url, ref, module): ...@@ -588,12 +588,12 @@ def fetchChange(url, ref, module):
subprocess.run(["git", "fetch", url, ref], universal_newlines=True, shell=isWindowsOS, cwd=os.path.join(builddir, module)) subprocess.run(["git", "fetch", url, ref], universal_newlines=True, shell=isWindowsOS, cwd=os.path.join(builddir, module))
def cherryPickChange(module, sha): def cherryPickChange(module, sha=""):
subprocess.run(["git", "cherry-pick", sha if sha else "FETCH_HEAD", "--no-commit"], cwd=os.path.join(builddir, module), stderr=subprocess.PIPE, subprocess.run(["git", "cherry-pick", sha if sha else "FETCH_HEAD", "--no-commit"], cwd=os.path.join(builddir, module), stderr=subprocess.PIPE,
universal_newlines=True, shell=isWindowsOS) universal_newlines=True, shell=isWindowsOS)
def lookupUnmergedCommit(revision, module): def lookupUnmergedCommit(revision, module=""):
commitRaw = requests.get(f"https://codereview.qt-project.org/changes/?q=commit:{revision}&o=ALL_REVISIONS&o=CURRENT_COMMIT").text[4:] commitRaw = requests.get(f"https://codereview.qt-project.org/changes/?q=commit:{revision}&o=ALL_REVISIONS&o=CURRENT_COMMIT").text[4:]
ref = "" ref = ""
if not commitRaw: if not commitRaw:
...@@ -620,7 +620,7 @@ def lookupUnmergedCommit(revision, module): ...@@ -620,7 +620,7 @@ def lookupUnmergedCommit(revision, module):
return (url, ref, module) return (url, ref, module)
def lookupCommitByRef(ref, module): def lookupCommitByRef(ref, module=""):
matches = re.findall(r"(\d{6})(?:/(\d{1,}))?", ref) matches = re.findall(r"(\d{6})(?:/(\d{1,}))?", ref)
changeNumber = "" changeNumber = ""
patchset = "" patchset = ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment