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

Don't force full calculation of layer extent when cloning layers #56434

Merged
merged 1 commit into from
Feb 23, 2024

Conversation

nyalldawson
Copy link
Collaborator

This can be extremely expensive to calculate for some sources, so just clone whatever information we currently have available instead of force calculating the full exact extent.

@nyalldawson nyalldawson added Regression Something which used to work, but doesn't anymore backport release-3_34 labels Feb 21, 2024
@github-actions github-actions bot added this to the 3.36.0 milestone Feb 21, 2024
Copy link

github-actions bot commented Feb 21, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 6c45977)

This can be extremely expensive to calculate for some sources,
so just clone whatever information we currently have available
instead of force calculating the full exact extent.
@qgis qgis deleted a comment from github-actions bot Feb 23, 2024
@nyalldawson nyalldawson merged commit b0d7820 into qgis:master Feb 23, 2024
29 checks passed
@nyalldawson nyalldawson deleted the fix_slow_clone branch February 23, 2024 02:47
@qgis-bot
Copy link
Collaborator

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 6c459778788... Don't force full calculation of layer extent when cloning layers
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging src/core/qgsmaplayer.cpp
CONFLICT (content): Merge conflict in src/core/qgsmaplayer.cpp
Auto-merging src/core/vector/qgsvectorlayer.cpp

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-release-3_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-56434-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6c45977878868a9b607817e8a4698ceb98aa2968
# Push it to GitHub
git push --set-upstream origin backport-56434-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

Then, create a pull request where the base branch is release-3_34 and the compare/head branch is backport-56434-to-release-3_34.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Feb 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 failed backport The automated backport attempt failed, needs a manual backport Regression Something which used to work, but doesn't anymore
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants