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
modified message when overriding existing quickmark #7635
base: main
Are you sure you want to change the base?
Conversation
10x, :) |
This comment was marked as resolved.
This comment was marked as resolved.
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.
Thanks! I added a suggestion on a better message wording.
The failing tests should be fine, looks like we have a couple of new flakiness issues with the recent Qt 6 merge.
Co-authored-by: Florian Bruhin <me@the-compiler.org>
LGTM now, though I'd prefer squashing the second commit into the first one for a cleaner Git log. |
Looks like there was a syntax error in my suggestion - sorry! Could you please fix that up?
Thanks for the offer - but there are tools like pyupgrade and flynt which can automate that work. The main issue right now is that doing so introduces a lot of code churn, causing more conflicts which currently open PRs. But for 4.0.0 we plan to take that step: #1455. |
I can do it, but this will probably create new commit. And I'm not very sure how to deal with the squashing.
Maybe you can squash everything after that? |
Don't worry about it - I can indeed just squash-merge this. |
This comment was marked as resolved.
This comment was marked as resolved.
@@ -186,7 +186,7 @@ def set_mark(): | |||
|
|||
if name in self.marks: | |||
message.confirm_async( | |||
title="Override existing quickmark?", | |||
title=f"Override existing quickmark?\nOld URL: {self.marks[name]}", |
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.
Modified the message when the user wants to create a new quickmark and quickmark with that slug already exists. The new message shows the current marked URL and asks if the user wants to replace it. Closes #7622.