Skip to content

Applying precommit commonhooks#10897

Merged
DelazJ merged 5 commits intoqgis:masterfrom
DelazJ:precommit_commonhooks
Apr 13, 2026
Merged

Applying precommit commonhooks#10897
DelazJ merged 5 commits intoqgis:masterfrom
DelazJ:precommit_commonhooks

Conversation

@DelazJ
Copy link
Copy Markdown
Collaborator

@DelazJ DelazJ commented Apr 8, 2026

This is a subset of #10856 where I started applying the pre-commit hooks. Splitting the different hooks allows to individually address and format them and incrementally configure them for the project.
More PR on the road...
@timlinux?

Goal:

Ticket(s): #

  • Backport to LTR documentation is requested

@DelazJ DelazJ added backport release_3.44 On merge create a backported pull request to 3.44 Backend labels Apr 8, 2026
@timlinux
Copy link
Copy Markdown
Member

LGTM thanks @DelazJ

@DelazJ DelazJ force-pushed the precommit_commonhooks branch from 6bc7842 to ad52262 Compare April 13, 2026 15:11
@DelazJ DelazJ merged commit bc4c09e into qgis:master Apr 13, 2026
3 checks passed
@DelazJ DelazJ deleted the precommit_commonhooks branch April 13, 2026 15:25
@qgis-bot
Copy link
Copy Markdown
Collaborator

The backport to release_3.44 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply e1effa0802... Apply standard hooks (trailing spaces, end of file, ...) to the docs folder
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".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging docs/developers_guide/codingstandards.rst
Auto-merging docs/developers_guide/localization.rst
CONFLICT (content): Merge conflict in docs/developers_guide/localization.rst
Auto-merging docs/developers_guide/unittesting.rst
Auto-merging docs/documentation_guidelines/do_translations.rst
Auto-merging docs/index.rst
Auto-merging docs/pyqgis_developer_cookbook/cheat_sheet.rst
CONFLICT (content): Merge conflict in docs/pyqgis_developer_cookbook/cheat_sheet.rst
Auto-merging docs/pyqgis_developer_cookbook/communicating.rst
CONFLICT (content): Merge conflict in docs/pyqgis_developer_cookbook/communicating.rst
Auto-merging docs/pyqgis_developer_cookbook/intro.rst
Auto-merging docs/pyqgis_developer_cookbook/network_analysis.rst
Auto-merging docs/pyqgis_developer_cookbook/plugins/plugins.rst
Auto-merging docs/pyqgis_developer_cookbook/processing.rst
Auto-merging docs/server_manual/getting_started.rst
Auto-merging docs/user_manual/auth_system/auth_overview.rst
CONFLICT (content): Merge conflict in docs/user_manual/auth_system/auth_overview.rst
Auto-merging docs/user_manual/expressions/expression.rst
CONFLICT (content): Merge conflict in docs/user_manual/expressions/expression.rst
Auto-merging docs/user_manual/expressions/expression_help/Conversions.rst
Auto-merging docs/user_manual/expressions/expression_help/Date_and_Time.rst
Auto-merging docs/user_manual/expressions/expression_help/GeometryGroup.rst
CONFLICT (modify/delete): docs/user_manual/expressions/expression_help/MagneticModels.rst deleted in HEAD and modified in e1effa0802 (Apply standard hooks (trailing spaces, end of file, ...) to the docs folder).  Version e1effa0802 (Apply standard hooks (trailing spaces, end of file, ...) to the docs folder) of docs/user_manual/expressions/expression_help/MagneticModels.rst left in tree.
Auto-merging docs/user_manual/expressions/expression_help/Math.rst
Auto-merging docs/user_manual/expressions/expression_help/Operators.rst
Auto-merging docs/user_manual/expressions/expression_help/Record_and_Attributes.rst
Auto-merging docs/user_manual/expressions/expression_help/String.rst
Auto-merging docs/user_manual/expressions/functions_list.rst
Auto-merging docs/user_manual/introduction/browser.rst
Auto-merging docs/user_manual/introduction/general_tools.rst
CONFLICT (content): Merge conflict in docs/user_manual/introduction/general_tools.rst
Auto-merging docs/user_manual/introduction/project_files.rst
Auto-merging docs/user_manual/introduction/qgis_configuration.rst
Auto-merging docs/user_manual/introduction/qgis_gui.rst
Auto-merging docs/user_manual/managing_data_source/create_layers.rst
Auto-merging docs/user_manual/managing_data_source/opening_data.rst
CONFLICT (content): Merge conflict in docs/user_manual/managing_data_source/opening_data.rst
Auto-merging docs/user_manual/managing_data_source/supported_data.rst
Auto-merging docs/user_manual/map_views/3d_map_view.rst
CONFLICT (content): Merge conflict in docs/user_manual/map_views/3d_map_view.rst
Auto-merging docs/user_manual/map_views/elevation_profile.rst
CONFLICT (content): Merge conflict in docs/user_manual/map_views/elevation_profile.rst
Auto-merging docs/user_manual/map_views/map_view.rst
CONFLICT (content): Merge conflict in docs/user_manual/map_views/map_view.rst
Auto-merging docs/user_manual/print_layout/create_output.rst
CONFLICT (modify/delete): docs/user_manual/print_layout/layout_items/layout_chart.rst deleted in HEAD and modified in e1effa0802 (Apply standard hooks (trailing spaces, end of file, ...) to the docs folder).  Version e1effa0802 (Apply standard hooks (trailing spaces, end of file, ...) to the docs folder) of docs/user_manual/print_layout/layout_items/layout_chart.rst left in tree.
Auto-merging docs/user_manual/print_layout/layout_items/layout_items_options.rst
CONFLICT (content): Merge conflict in docs/user_manual/print_layout/layout_items/layout_items_options.rst
Auto-merging docs/user_manual/print_layout/layout_items/layout_legend.rst
Auto-merging docs/user_manual/print_layout/layout_items/layout_map.rst
CONFLICT (content): Merge conflict in docs/user_manual/print_layout/layout_items/layout_map.rst
Auto-merging docs/user_manual/processing/3rdParty.rst
Auto-merging docs/user_manual/processing/modeler.rst
Auto-merging docs/user_manual/processing/toolbox.rst
Auto-merging docs/user_manual/processing_algs/gdal/index.rst
CONFLICT (content): Merge conflict in docs/user_manual/processing_algs/gdal/index.rst
CONFLICT (modify/delete): docs/user_manual/processing_algs/gdal/miscellaneous.rst deleted in HEAD and modified in e1effa0802 (Apply standard hooks (trailing spaces, end of file, ...) to the docs folder).  Version e1effa0802 (Apply standard hooks (trailing spaces, end of file, ...) to the docs folder) of docs/user_manual/processing_algs/gdal/miscellaneous.rst left in tree.
Auto-merging docs/user_manual/processing_algs/qgis/database.rst
CONFLICT (content): Merge conflict in docs/user_manual/processing_algs/qgis/database.rst
Auto-merging docs/user_manual/processing_algs/qgis/networkanalysis.rst
CONFLICT (content): Merge conflict in docs/user_manual/processing_algs/qgis/networkanalysis.rst
Auto-merging docs/user_manual/processing_algs/qgis/plots.rst
Auto-merging docs/user_manual/processing_algs/qgis/pointcloudconversion.rst
CONFLICT (content): Merge conflict in docs/user_manual/processing_algs/qgis/pointcloudconversion.rst
Auto-merging docs/user_manual/processing_algs/qgis/rasteranalysis.rst
CONFLICT (content): Merge conflict in docs/user_manual/processing_algs/qgis/rasteranalysis.rst
Auto-merging docs/user_manual/processing_algs/qgis/vectoranalysis.rst
Auto-merging docs/user_manual/processing_algs/qgis/vectorgeneral.rst
Auto-merging docs/user_manual/processing_algs/qgis/vectorgeometry.rst
CONFLICT (content): Merge conflict in docs/user_manual/processing_algs/qgis/vectorgeometry.rst
Auto-merging docs/user_manual/style_library/3d_symbols.rst
Auto-merging docs/user_manual/style_library/label_settings.rst
CONFLICT (content): Merge conflict in docs/user_manual/style_library/label_settings.rst
Auto-merging docs/user_manual/working_with_mesh/mesh.rst
Auto-merging docs/user_manual/working_with_ogc/ogc_client_support.rst
Auto-merging docs/user_manual/working_with_point_clouds/point_clouds.rst
CONFLICT (content): Merge conflict in docs/user_manual/working_with_point_clouds/point_clouds.rst
Auto-merging docs/user_manual/working_with_raster/raster_properties.rst
CONFLICT (content): Merge conflict in docs/user_manual/working_with_raster/raster_properties.rst
Auto-merging docs/user_manual/working_with_vector/attribute_table.rst
CONFLICT (content): Merge conflict in docs/user_manual/working_with_vector/attribute_table.rst
Auto-merging docs/user_manual/working_with_vector/vector_properties.rst
CONFLICT (content): Merge conflict in docs/user_manual/working_with_vector/vector_properties.rst

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.44 release_3.44
# Navigate to the new working tree
cd .worktrees/backport-release_3.44
# Create a new branch
git switch --create backport-10897-to-release_3.44
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e1effa0802a5aaae9237c36fd3898511387dfb30,73feb51cdb6c5619fbaff95506c6e4a26ce00684,850417727b0926e3d91f25efdccae4ef42a5c112,baee49993ba9bdc336b8137da5537ddfb5df2f24,ad5226259aa3d8ad086f98117f7b47e95cd64f23
# Push it to GitHub
git push --set-upstream origin backport-10897-to-release_3.44
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3.44

Then, create a pull request where the base branch is release_3.44 and the compare/head branch is backport-10897-to-release_3.44.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Backend backport release_3.44 On merge create a backported pull request to 3.44

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants