Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow specifying custom upstream remote name #35

Merged
merged 13 commits into from
Oct 3, 2022

Conversation

Jackenmen
Copy link
Contributor

@Jackenmen Jackenmen commented Aug 7, 2021

Fixes #19

@Jackenmen Jackenmen marked this pull request as draft August 8, 2021 18:46
@Jackenmen Jackenmen marked this pull request as ready for review August 8, 2021 19:02
@Jackenmen
Copy link
Contributor Author

Fixed the conflicts.

Copy link
Contributor

@DanielNoord DanielNoord left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Just some minor nitpicks and a general question about whether we should validate the passed remote.

cp = CherryPicker(
"origin",
"22a594a0047d7706537ff2ac676cdc0f1dcb329c",
branches,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
branches,
["3.6"],

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if remote_name != "origin":
git_remote("add", "origin", "https://github.com/miss-islington/cpython.git")

branches = ["3.6"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
branches = ["3.6"]

Why assign to a variable if you can just pass it directly?

Copy link
Contributor Author

@Jackenmen Jackenmen Jul 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because it's consistent with the rest of the code in this file. Or more truthfully... Because I copy-pasted one of the other test cases when making this one :) I'm indifferent to what's done here but I'll wait to change it until one of the maintainers requests it.

cherry_picker/cherry_picker.py Outdated Show resolved Hide resolved
cherry_picker/test_cherry_picker.py Outdated Show resolved Hide resolved
cherry_picker/cherry_picker.py Outdated Show resolved Hide resolved
readme.rst Outdated Show resolved Hide resolved
@Mariatta Mariatta merged commit 2f85c32 into python:main Oct 3, 2022
@Mariatta
Copy link
Member

Mariatta commented Oct 3, 2022

Thanks for the PR, sorry it's taking so long to look into it.

@Jackenmen Jackenmen deleted the issue/19 branch October 4, 2022 06:41
@Jackenmen Jackenmen mentioned this pull request Oct 4, 2022
@Mariatta Mariatta added the hacktoberfest-accepted Accepted for hacktoberfest label Oct 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA signed hacktoberfest-accepted Accepted for hacktoberfest
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cherry_picker hardcodes the name of the python/cpython.git repo
5 participants