Stop offering the enclosing repository's worktrees - #2150
Merged
Conversation
A project marked out by its own .projectile inside a larger repository was being offered that repository's worktrees. `projectile-project-vcs' answers `git' for such a project - it walks up to find the repository, so that file listing still works - and the worktree lookup took that as license to ask git, which happily listed worktrees that are copies of the repository, not of the project. Switching to one landed you somewhere unrelated. The repository identity layer already made this distinction; the git lookup just wasn't using it. It now requires the project to hold a .git of its own, which is exactly what being a checkout means. While here, make the two commands explain themselves when they come up empty. "No other checkout found" reads as "I looked" - unhelpful when the project is under Subversion and Projectile can't look at all, so that case now says so and points at the sibling command, which needs no repository. And a sibling lookup finding nothing is an ordinary outcome of the share cap rather than a fault, so it points at `projectile-project-groups'. No CHANGELOG entry: all of this is refining code from #2147 and #2148, which haven't been in a release yet.
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
1 participant
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.
Spotted while thinking about what these commands do when there's no repository to identify.
A project marked out by its own
.projectileinside a bigger repository was being offered that repository's worktrees.projectile-project-vcssaysgitfor such a project - it walks up so file listing still works - and the worktree lookup took that as license to ask git, which listed worktrees that are copies of the repository, not of the project. Picking one landed you somewhere unrelated. The identity layer already drew this distinction; the git lookup just wasn't using it.The rest is making the two commands explain themselves when they come up empty. "No other checkout found" reads as "I looked", which is misleading when the project is under Subversion and Projectile can't look at all - that now says so and points at
s-p n, which needs no repository at all. A sibling lookup finding nothing is likewise an ordinary result of the share cap rather than a fault, so it points atprojectile-project-groups.No CHANGELOG entry - this is all refining #2147 and #2148, neither of which has been in a release.