Merge pull request #10170 from Byron/fix

better error for repossitory ownership issues

Author: Byron

Cargo.lock

@@ -228,7 +228,7 @@
 			{/if}
 		</div>
 
-		{#if isNotInWorkspace}
+		{#if currentMode !== null && isNotInWorkspace}
 			<Tooltip text="Switch back to gitbutler/workspace">
 				<Button
 					kind="outline"

apps/desktop/src/components/ChromeHeader.svelte

@@ -1,6 +1,7 @@
 export enum Code {
 	Unknown = 'errors.unknown',
 	Validation = 'errors.validation',
+	RepoOwnership = 'errors.repo_ownership',
 	ProjectsGitAuth = 'errors.projects.git.auth',
 	DefaultTargetNotFound = 'errors.projects.default_target.not_found',
 	CommitSigningFailed = 'errors.commit.signing_failed',
@@ -16,6 +17,11 @@ Commit signing failed and has now been disabled. You can configure commit signin
 
 Please check our [documentation](https://docs.gitbutler.com/features/virtual-branches/signing-commits) on setting up commit signing and verification.
 		`,
+	[Code.RepoOwnership]: `
+The repository ownership couldn't be determined. Consider allowing it using:
+
+    git config --global --add safe.directory copy/of/path/shown/below
+	`,
 	[Code.SecretKeychainNotFound]: `
 Please install a keychain service to store and retrieve secrets with.
 

apps/desktop/src/lib/error/knownErrors.ts

@@ -55,6 +55,14 @@ impl CommandContext {
     /// Open the repository identified by `project` and perform some checks.
     pub fn open(project: &Project, app_settings: AppSettings) -> Result<Self> {
         let repo = git2::Repository::open(&project.path)?;
+        Self::open_from(project, app_settings, repo)
+    }
+
+    pub fn open_from(
+        project: &Project,
+        app_settings: AppSettings,
+        repo: git2::Repository,
+    ) -> Result<Self> {
         Ok(Self {
             git_repo: repo,
             project: project.clone(),

crates/gitbutler-command-context/src/lib.rs

@@ -128,6 +128,7 @@ pub enum Code {
     #[default]
     Unknown,
     Validation,
+    RepoOwnership,
     ProjectGitAuth,
     DefaultTargetNotFound,
     CommitSigningFailed,
@@ -144,6 +145,7 @@ impl std::fmt::Display for Code {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let code = match self {
             Code::Unknown => "errors.unknown",
+            Code::RepoOwnership => "errors.repo_ownership",
             Code::Validation => "errors.validation",
             Code::ProjectGitAuth => "errors.projects.git.auth",
             Code::DefaultTargetNotFound => "errors.projects.default_target.not_found",

crates/gitbutler-error/src/error.rs

@@ -153,8 +153,6 @@ impl Controller {
             }
         }
 
-        // FIXME(qix-): On windows, we have to force to system executable.
-        // FIXME(qix-): This is a hack for now, and will be smoothed over in the future.
         #[cfg(windows)]
         let project_owned = {
             let mut project = project.clone();
@@ -218,7 +216,6 @@ impl Controller {
             }
         }
 
-        // FIXME(qix-): On windows, we have to force to system executable
         #[cfg(windows)]
         {
             project.preferred_key = AuthKey::SystemExecutable;

crates/gitbutler-project/src/controller.rs

@@ -21,16 +21,13 @@ tauri-build = { version = "2.3.1", features = [] }
 anyhow = "1.0.99"
 backtrace = { version = "0.3.74", optional = true }
 console-subscriber = "0.4.1"
-git2.workspace = true
 gix = { workspace = true, features = [
     "max-performance",
     "blocking-http-transport-curl",
     "worktree-mutation",
 ] }
-reqwest = { version = "0.12.23", features = ["json"] }
 serde.workspace = true
 serde_json = { version = "1.0", features = ["std", "arbitrary_precision"] }
-serde-error = "0.1.3"
 tauri = { version = "^2.7.0", features = ["unstable"] }
 tauri-plugin-dialog = "2.3.2"
 tauri-plugin-fs = "2.4.1"
@@ -47,45 +44,28 @@ tauri-plugin-clipboard-manager = "2.3.0"
 
 parking_lot.workspace = true
 log = "^0.4"
+git2.workspace = true
 # The features here optimize for performance.
 tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot"] }
 tracing.workspace = true
 tracing-appender = "0.2.3"
 tracing-subscriber.workspace = true
 tracing-forest = { version = "0.2.0" }
 gitbutler-watcher.workspace = true
-gitbutler-branch-actions.workspace = true
-gitbutler-oplog.workspace = true
-gitbutler-repo.workspace = true
 gitbutler-repo-actions.workspace = true
 gitbutler-command-context.workspace = true
 but-feedback.workspace = true
 gitbutler-project.workspace = true
-gitbutler-user.workspace = true
-gitbutler-branch.workspace = true
-gitbutler-reference.workspace = true
 gitbutler-error.workspace = true
 gitbutler-secret.workspace = true
 gitbutler-id.workspace = true
-gitbutler-oxidize.workspace = true
-gitbutler-stack.workspace = true
-gitbutler-diff.workspace = true
-gitbutler-operating-modes.workspace = true
-gitbutler-edit-mode.workspace = true
-gitbutler-sync.workspace = true
-gitbutler-forge.workspace = true
 but-broadcaster.workspace = true
 but-db.workspace = true
 but-settings.workspace = true
 but-workspace.workspace = true
 but-core.workspace = true
-but-graph.workspace = true
-but-hunk-dependency.workspace = true
-but-hunk-assignment.workspace = true
 but-action.workspace = true
 but-bot.workspace = true
-but-rules.workspace = true
-but-path.workspace = true
 but-api.workspace = true
 but-claude.workspace = true
 open = "5"

crates/gitbutler-tauri/Cargo.toml

@@ -61,7 +61,23 @@ pub fn set_project_active(
             return Ok(None);
         }
     };
-    let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+    let repo = git2::Repository::open(&project.path)
+        // Only capture this information here to prevent spawning too many errors because of this
+        // (the UI has many parallel calls in flight).
+        .map_err(|err| {
+            let code = err.code();
+            let err = anyhow::Error::from(err);
+            if code == git2::ErrorCode::Owner {
+                err.context(gitbutler_error::error::Code::RepoOwnership)
+            } else {
+                err
+            }
+        })?;
+    let ctx = &mut CommandContext::open_from(
+        &project,
+        AppSettings::load_from_default_path_creating()?,
+        repo,
+    )?;
     let mode =
         window_state.set_project_to_window(window.label(), &project, &app_settings_sync, ctx)?;
     let db_error = assure_database_valid(project.gb_dir())?;