-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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
Fix python script editor "open in external editor" action #57682
Merged
Conversation
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
elpaso
approved these changes
Jun 6, 2024
When a system has a EDITOR environment variable set to either an invalid editor, or an editor which requires a terminal (eg nano/vim), then fallback to the QDesktopServices approach to opening the script Avoids this button doing nothing.
…itorWidget This allows the editor to be opened in a proper detached process, avoiding the editor being closed when QGIS is exited. Move to a blocklist for terminal text editors instead of the fragile polling approach (which eg doesn't work if the editor is set to pycharm)
e1f51c3
to
9559a26
Compare
@elpaso i've changed the approach here a bit, do you mind re-reviewing? |
elpaso
approved these changes
Jun 7, 2024
Thanks @elpaso! |
The backport to
stderr
stdout
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-57682-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6f5cb77cd9287ae79bfdf98bc34fafe03dd4c78c,7271220ce493c2b4be2a16a2306f9c92afcd9d40,9559a2606454f8da135ae28e8e29c319151a4954,16a1ef9477bcfddbb0441f23191ebca8b8c32568
# Push it to GitHub
git push --set-upstream origin backport-57682-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports Then, create a pull request where the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport queued_ltr_backports
Queued Backports
failed backport
The automated backport attempt failed, needs a manual backport
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.
When a system has a EDITOR environment variable set to either an invalid editor, or an editor which requires a terminal (eg nano/vim), then fallback to the QDesktopServices approach to opening the script
Avoids this button doing nothing.