Merge upstream into master#2
Open
dellekappa wants to merge 203 commits intomasterfrom
Open
Conversation
Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
…true` (copier-org#2151) Signed-off-by: Kamontat Chantrachirathumrong <14089557+kamontat@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
…ecopy,update}` functions
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com>
…tern matching during updates Previously, user-deleted file paths were not normalized before matching against skip-if-exists patterns. This caused mismatches when paths contained special characters, as the path representation differed from the gitignore-style pattern representation. The fix applies `normalize_git_path` to user-deleted file paths before matching them against skip-if-exists patterns, ensuring consistent path representation and correct pattern matching. Fixes missing recreation of user-deleted files that should match skip-if-exists patterns during project updates.
Deprecate importing `VcsRef` directly from `copier` in favor of importing from `copier.types`. This change aligns with the revised public `types` module structure while maintaining backward compatibility through a deprecation warning.
…gorithm Prefix deleted file paths with `/` to treat them as absolute paths anchored at the project root, turning them into gitignore-style patterns that match only the exact paths. This prevents unintended deletion of files with the same name in subdirectories during project updates.
…bproject root in update algorithm Skip-if-exists patterns are documented as gitignore-style patterns but were incorrectly passed to the update algorithm's internal `git apply --exclude` flag that expects pathspec patterns. This caused patterns with gitignore- specific syntax (e.g., `/` prefix for anchoring) to fail. Now patterns are consistently applied as gitignore-style and properly anchored at the subproject root, which may be a subdirectory of the Git repo.
This reverts commit 47afec3.
…Phase` and `types.VcsRef` enums This reverts commit 0fda385.
…ker.run_*` methods
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
16 participants
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.
No description provided.