GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Implement storing runtime state in repo level Git config by webknjaz · Pull Request #295 · python/core-workflow

Conversation

@webknjaz

@webknjaz webknjaz commented Nov 20, 2018 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member

Ref #277

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@webknjaz
webknjaz requested a review from Mariatta as a code owner November 20, 2018 17:13
@the-knights-who-say-ni the-knights-who-say-ni added the CLA signed label Nov 20, 2018
@webknjaz webknjaz mentioned this pull request Nov 20, 2018
[cherry-picker] Cherry-picker looses state if the target branch doesn't have a config in it #277
Closed
@webknjaz
webknjaz force-pushed the bugfix/consistent-config-cherry-picker branch from 8b05f5b to df45585 Compare November 23, 2018 15:12
@webknjaz

webknjaz commented Nov 23, 2018

Copy link
Copy Markdown
Member Author

@Mariatta @abadger I've cleaned things up a bit. Maybe it's time to move helper functions into util module/package or is it a task for separate PR?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz

webknjaz commented Nov 27, 2018 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member Author

Hi @Mariatta,

I'm currently waiting for your approval wrt architectural changes. After that I'll proceed with adjusting/adding tests.

P.S. @abadger suggested that I could add a CLI command for git config --local --remove-section cherry-picker but I'm doubtful: it's a dangerous thing for the flow and providing users with such UI might encourage them to overuse it where they don't understand consequences. Ideally, that failure shouldn't be happening during the normal process at all.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@Mariatta

Mariatta commented Nov 30, 2018

Copy link
Copy Markdown
Member

Sorry for the delay. Will take a look in the weekend.

webknjaz reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz

webknjaz commented Nov 30, 2018

Copy link
Copy Markdown
Member Author

Cool, thanks :)

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz

webknjaz commented Dec 7, 2018

Copy link
Copy Markdown
Member Author

Hey @Mariatta, any 🤔💭 on this so far?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz

webknjaz commented Dec 17, 2018

Copy link
Copy Markdown
Member Author

Hi @Mariatta, any comments?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@Mariatta

Mariatta commented Jan 3, 2019

Copy link
Copy Markdown
Member

So sorry, I think I'm not able to effectively review this PR.
Is there anyone else who might be able to help review this?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz

webknjaz commented Jan 3, 2019

Copy link
Copy Markdown
Member Author

@Mariatta
Well, @abadger said that it's fine. We just wanted to check that it's fine with you since you're the maintainer.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz

webknjaz commented Jan 3, 2019

Copy link
Copy Markdown
Member Author

I'll ask @asvetlov to take a look as well, then, to have more eyes on it.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

asvetlov
asvetlov reviewed Jan 3, 2019
View reviewed changes

@asvetlov asvetlov left a comment

Copy link
Copy Markdown
Contributor

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.

The idea looks interesting.
Would you add tests for it?
At least we have several ones in test.py already.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
Comment thread cherry_picker/cherry_picker/cherry_picker.py Resolved

Uh oh!

There was an error while loading. Please reload this page.

Comment thread cherry_picker/cherry_picker/cherry_picker.py Resolved

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz

webknjaz commented Jan 3, 2019

Copy link
Copy Markdown
Member Author

Thanks for the review, Andrew! I just wanted to wait for architectural approval before investing some time into tests. Now I can proceed :)

Mariatta reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@Mariatta

Mariatta commented Jan 3, 2019

Copy link
Copy Markdown
Member

Thanks @webknjaz and @asvetlov. For me, as long as there is no change to how it works for CPython /miss-islington’s purpose, then I'm good with it.

webknjaz reacted with hooray emoji
All reactions
  • 🎉 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz

webknjaz commented Jan 3, 2019

Copy link
Copy Markdown
Member Author

Great, thanks @Mariatta!

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz
webknjaz force-pushed the bugfix/consistent-config-cherry-picker branch 3 times, most recently from f4f8d67 to a207fb9 Compare January 7, 2019 18:37
@webknjaz
webknjaz force-pushed the bugfix/consistent-config-cherry-picker branch from 4b63d05 to dda278d Compare February 9, 2019 23:39
webknjaz added 9 commits February 10, 2019 00:51
@webknjaz
Add initial impl of storinig state in Git config
509a2ad
@webknjaz
Drop test for find_project_root
9f626e6
@webknjaz
🐛 Fix final path construction in load_config
91959cb
@webknjaz
🎨 Validate input in from_git_rev_read function
cee3fee
@webknjaz
🚑🐛 Fix all existing tests to match new reality
66240f3
@webknjaz
🎨 Move conf path from global scope to CherryPicker
de10340
@webknjaz
🎨 Use Enum for ALLOWED_STATES
1cd2dd0
@webknjaz
🎨 Make check_output line shorter
1395bf1
@webknjaz
🐛 Improve error processing in from_git_rev_read
a9e302b
@webknjaz
✅ Add cherry-pick success test
1a5d76f
@webknjaz
webknjaz force-pushed the bugfix/consistent-config-cherry-picker branch from dda278d to 1a5d76f Compare February 9, 2019 23:52
webknjaz added 10 commits February 10, 2019 01:39
@webknjaz
✅ Add get_state_and_verify fail test
60c2c17
@webknjaz
✅ Add push_to_remote tests
98c4620
@webknjaz
✅ Add backport test with no branch
d142450
@webknjaz
🐛 Interrupt cherry-pick loop on no-push
e2ca39d
@webknjaz
🐛 Ignore missing config pointer on wipe
d2aefc7
@webknjaz
✅ Cover backport method with tests
0180085
@webknjaz
✅ Cover --continue with tests
69db409
@webknjaz
🎨 Improve test_backport_pause_and_continue
c12ed58
@webknjaz
🎨 Use raw-string for regex
0eed5ed
@webknjaz
✅ Cover --abort with tests
bbebd41
@webknjaz

webknjaz commented Feb 10, 2019

Copy link
Copy Markdown
Member Author

Update: with the recent commits I've hit 83% test coverage.

Mariatta reacted with hooray emoji
All reactions
  • 🎉 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

webknjaz added 3 commits February 10, 2019 16:36
@webknjaz
🎨 Store all states in Enum structure
3630ad4
@webknjaz
🔥 Drop garbage comments
4673edc
@webknjaz
🎨 Use match instead of message in pytest.raises
fdf45ae
@webknjaz webknjaz changed the title [WIP] [PoC] Initial implementation of storing state in Git config Implement storing runtime state in repo level Git config Feb 10, 2019
@webknjaz

webknjaz commented Feb 10, 2019

Copy link
Copy Markdown
Member Author

@Mariatta @abadger @asvetlov I believe this is ready for the final review :)

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

Mariatta
Mariatta reviewed Feb 12, 2019
View reviewed changes
Comment thread cherry_picker/cherry_picker/test.py Resolved

Uh oh!

There was an error while loading. Please reload this page.

@Mariatta @webknjaz
f-stringify concatenation in tests
af69d6d
Co-Authored-By: webknjaz <[email protected]>
@Mariatta

Mariatta commented Feb 13, 2019

Copy link
Copy Markdown
Member

It seems ok to me. Would @abadger or @asvetlov be able to do more thorough review?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz

webknjaz commented Feb 13, 2019

Copy link
Copy Markdown
Member Author

Thanks. I'll ping them. I think Andrew is away for a couple of days, though...

Mariatta reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

asvetlov
asvetlov approved these changes Feb 21, 2019
View reviewed changes

@asvetlov asvetlov left a comment

Copy link
Copy Markdown
Contributor

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.

LGTM now

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@Mariatta

Mariatta commented Feb 21, 2019

Copy link
Copy Markdown
Member

Thanks @asvetlov and @webknjaz. If you could update the release notes and up the version, I can merge and get it deployed to PyPI.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz

webknjaz commented Feb 21, 2019

Copy link
Copy Markdown
Member Author

Sure, on it

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz
📝💡 Add change notes
6e68f8b
@webknjaz

webknjaz commented Feb 21, 2019

Copy link
Copy Markdown
Member Author

done!

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@Mariatta
Mariatta merged commit b4773c9 into python:master Feb 21, 2019
@Mariatta

Mariatta commented Feb 21, 2019

Copy link
Copy Markdown
Member

Thanks! Will release soon!

webknjaz reacted with hooray emoji webknjaz reacted with rocket emoji
All reactions
  • 🎉 1 reaction
  • 🚀 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@webknjaz webknjaz mentioned this pull request Feb 10, 2025
Loss of title and description when doing cherry_picker --continue python/cherry-picker#7
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mariatta Mariatta Mariatta left review comments
@asvetlov asvetlov asvetlov approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

CLA signed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@webknjaz @Mariatta @asvetlov @the-knights-who-say-ni
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.