Replace legacy But API call for Project Not Found branches#13686
Merged
Byron merged 3 commits intogitbutlerapp:masterfrom May 8, 2026
Merged
Replace legacy But API call for Project Not Found branches#13686Byron merged 3 commits intogitbutlerapp:masterfrom
Byron merged 3 commits intogitbutlerapp:masterfrom
Conversation
refactor: replace legacy_project with gitbutler_project::get_raw refactor: simplify project context creation Replace manual Context creation with direct get_raw call to reduce unnecessary intermediate variable allocation and improve code clarity in the legacy projects module. fix: skip unresolvable project handles in listing Change project listing to gracefully skip handles that can no longer be resolved instead of failing the entire operation. This handles cases where projects are deleted from storage but the frontend's opened_projects set hasn't caught up yet. Replace the map().collect() pattern with filter_map() to skip stale entries and log warnings for debugging. This mirrors the warn-and-skip pattern used elsewhere for migration failures and ensures the post-deletion refresh flow doesn't break.
sebastianhuus
force-pushed
the
sh-branch-1
branch
2 times, most recently
from
8f6a9a5 to
2e21580
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves the “project not found / removed from disk” recovery path by ensuring legacy project API calls can still read project metadata from storage without eagerly opening the repository, allowing the frontend to show the “Remove Project” action again.
Changes:
- Switched legacy
but-apiproject endpoints to usegitbutler_project::get_rawinstead of constructing abut_ctx::Context/ usinglegacy_project. - Added
gitbutler_project::get_raw_with_pathto support isolated tests (explicitapp_data_dir). - Added an integration test verifying raw project metadata can be loaded after the worktree directory is deleted from disk.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
crates/but-api/src/legacy/projects.rs |
Uses storage-only get_raw for get_project (no-validation path), list_projects opened-project detection, and delete_project to avoid repo-opening failures when the worktree is missing. |
crates/gitbutler-project/src/lib.rs |
Adds get_raw_with_path(app_data_dir, id) helper for tests/diagnostics that must not rely on global app_data_dir. |
crates/gitbutler-project/tests/project/main.rs |
Adds coverage to ensure raw project retrieval still succeeds after the project worktree is removed from disk. |
| #[instrument(err(Debug))] | ||
| pub fn delete_project(project_id: ProjectHandleOrLegacyProjectId) -> Result<()> { | ||
| let project = legacy_project(project_id)?; | ||
| let project = gitbutler_project::get_raw(project_id)?; |
Contributor
Author
|
Pushing with an extra fix to satisfy e2e test. will squash if good |
Add a new testing function `get_raw_with_path` that allows retrieving raw project metadata without validating the worktree exists on disk. This enables testing the recovery flow used by `ProjectNotFound`, `delete_project`, and `list_projects` which rely on storage-only metadata. Include a test case verifying `get_raw` succeeds when the worktree is deleted from disk, ensuring the recovery flow remains functional. Refactor formatting in legacy projects handler for consistency.
Byron
approved these changes
May 8, 2026
Collaborator
Byron
left a comment
Byron
left a comment
There was a problem hiding this comment.
Thanks a lot for the follow-up.
I was able to validate that the project removal option is now present again and it works.
While the fix isn't great, it's all in legacy code and we will have to do this properly once it's moved to non-legacy.
So let's take the quick fix and keep the time spent with it as low as possible.
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.
🧢 Changes
crates/but-api/src/legacy/projects.rs:crates/gitbutler-project/src/lib.rsandcrates/gitbutler-project/src/lib.rs:get_raw_with_pathand new test that verifiesget_rawcan recover when a project is no longer present on disk.☕️ Reasoning
This is a follow-up based on a discussion for #13613. I traced the error chain from the message posted in the picture below and found that it was a race condition in the legacy project API. This led to the Remove Project button not being displayed if you try to open a Git Butler project that was deleted from disk.
Notice that there is no button to remove the project – the project is effectively stuck in the Projects list
This PR covers two scenarios which I've tested:
These changes restore existing backend and frontend logic that was never hit:
Remove Project button is now restored