This repository has been archived by the owner on Jul 30, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 4
Rename PR branch variables #32
Open
katieworton
wants to merge
2
commits into
Linaro:master
Choose a base branch
from
katieworton:rename_branch_var
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -218,15 +218,15 @@ def run(raw_args=None): | |
github_repo = g.get_repo(f"{username}/{repo_name}") | ||
|
||
# Base patch - base patch for PRs | ||
base_patch = "origin/master" | ||
next_pr_base_patch = "master" | ||
|
||
# If there are any formatting updates, make these | ||
if repo.index.diff("HEAD"): | ||
summary = "Skipfile formatting updates" | ||
message = "Clean up skipfile formatting." | ||
base = "master" | ||
pr_base_patch = next_pr_base_patch | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Then we don't need this or? |
||
head = f"formatting-update-{date_str}-{patch_count}" | ||
base_patch = head | ||
next_pr_base_patch = head | ||
|
||
logger.debug( | ||
"branches:" + "\n".join([str(b.name) for b in github_repo.get_branches()]) | ||
|
@@ -249,7 +249,7 @@ def run(raw_args=None): | |
github_repo, | ||
summary, | ||
message, | ||
base, | ||
pr_base_patch, | ||
head, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we use head here and not the next_pr_base_patch variable ? |
||
) | ||
|
||
|
@@ -363,8 +363,9 @@ def run(raw_args=None): | |
# head name for update | ||
head = f"skipfile-update-{date_str}-{patch_count}" | ||
|
||
# Check out the base patch | ||
repo.git.checkout(base_patch) | ||
# Check out the base patch - this doesn't move since we want to | ||
# create the different PRs in parallel after applying formatter | ||
repo.git.checkout(next_pr_base_patch) | ||
|
||
skipfile["skiplist"] = new_skiplist | ||
|
||
|
@@ -392,7 +393,7 @@ def run(raw_args=None): | |
+ f"{squad_build_urls}" | ||
) | ||
# set base patch for PR | ||
base = base_patch | ||
pr_base_patch = next_pr_base_patch | ||
|
||
if len(summary) > 50: | ||
# Truncate the commit summary to < 50 characters for git commit | ||
|
@@ -414,7 +415,7 @@ def run(raw_args=None): | |
github_repo, | ||
summary, | ||
message, | ||
base, | ||
pr_base_patch, | ||
head, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here |
||
) | ||
|
||
|
@@ -423,7 +424,7 @@ def run(raw_args=None): | |
new_skipitem = None | ||
# Log commit to file | ||
with open(f"{head}.diff", "w") as file: | ||
diff = popen(f"git diff {base} {head}").read() | ||
diff = popen(f"git diff {pr_base_patch} {head}").read() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. head is used here too, should it or ? |
||
file.write(f"{summary}\n{message}\n{diff}") | ||
|
||
return 0 | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
next_base_branch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we should say:
base_branch = next_base_branch = "master"