fix(bundle): allow 'catalog remove' by the same relative path used to add#3242
Merged
mnriem merged 2 commits intoJun 30, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes an asymmetry in the bundler catalog config logic so that a project-scoped local catalog added via a relative path can also be removed using that same relative path (by matching the canonicalized absolute form stored in config). It also adds a unit test to prevent regressions.
Changes:
- Update
remove_source()to also compare against a canonicalized form of the removal target for local-path inputs. - Add a unit test covering add/remove using a relative local path and verifying the not-found behavior on a second removal attempt.
Show a summary per file
| File | Description |
|---|---|
| tests/unit/test_bundler_catalog_config.py | Adds coverage for removing a local catalog source using the same relative path it was added with. |
| src/specify_cli/bundler/commands_impl/catalog_config.py | Extends removal matching to include canonicalized local paths so stored absolute paths can be removed via relative inputs. |
Review details
Tip
Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Files reviewed: 2/2 changed files
- Comments generated: 1
- Review effort level: Low
mnriem
requested changes
Jun 29, 2026
mnriem
left a comment
mnriem
left a comment
Collaborator
There was a problem hiding this comment.
Please address Copilot feedback
… add
add_source canonicalizes a local catalog path to an absolute url before persisting it, but remove_source compared only the raw input against the stored id/url. So 'bundle catalog remove ./cat.json' could not undo 'bundle catalog add ./cat.json' -- the stored url was absolute, the removal target relative, and they never matched ('No project-scoped catalog source found'). Match the canonicalized form too (a no-op for ids and remote urls), so a local source is removable by the same path it was added with.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…ly as fallback Address Copilot review: canonicalizing the removal target unconditionally could let 'remove <id>' also delete a different source whose url equals that id's canonicalized path (ids are treated as local paths by _canonicalize_url, empty scheme). Try an exact id/url match first; only fall back to a canonicalized-url match when no exact match is found, so relative-path removal still works without collateral deletion. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
jawwad-ali
force-pushed
the
fix/bundle-catalog-remove-relative-path
branch
from
5ef10cf to
dac7c25
Compare
mnriem
approved these changes
Jun 30, 2026
Collaborator
|
Thank you! |
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
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.
Description
bundle catalog addcanonicalizes a local catalog path to an absolute url before persisting it (add_source→_canonicalize_url). Butremove_sourcecompared only the raw input against the storedid/url:So
bundle catalog remove ./cat.jsoncould not undobundle catalog add ./cat.json: the stored url is absolute, the removal target is the relative string, they never match, and the command fails with "No project-scoped catalog source matching … found" even though the source is present.Fix
In
remove_source, also match the canonicalized form of the target (_canonicalize_urlis a no-op for ids and remote urls, so this only adds the local-path case). A local source is now removable by the same path it was added with.Testing
uvx ruff checkclean.test_remove_source_accepts_relative_local_path: addsub/cat.json, removesub/cat.json→ succeeds, and a second remove raises the not-found error. Fails before this change, passes after.test_add_source_refuses_symlinked_specify_escape, is an unrelated pre-existing Windows symlink-privilege skip; it passes on Linux CI and is in the untouchedadd_sourcepath.)AI Disclosure
Found and fixed with Claude Code (Claude Opus 4.8) under my direction. AI spotted the add/remove canonicalization asymmetry; I reproduced the failed removal, confirmed id/absolute-url/not-found paths are unaffected, and reviewed the diff before submitting.