refactor

Author: Byron

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

@@ -8,8 +8,7 @@ export enum Code {
 	ProjectMissing = 'errors.projects.missing',
 	SecretKeychainNotFound = 'errors.secret.keychain_notfound',
 	MissingLoginKeychain = 'errors.secret.missing_login_keychain',
-	GitHubTokenExpired = 'errors.github.expired_token',
-	NonGitRepository = 'errors.projects.not_git_repository'
+	GitHubTokenExpired = 'errors.github.expired_token'
 }
 
 export const KNOWN_ERRORS: Record<string, string> = {
@@ -35,8 +34,5 @@ With \`seahorse\` or equivalent, create a \`Login\` password store, right click
 	`,
 	[Code.GitHubTokenExpired]: `
 Your GitHub token appears expired, please check your settings!
-	`,
-	[Code.NonGitRepository]: `
-The selected directory is not a Git repository. Would you like to initialize a Git repository in this directory?
 	`
 };

apps/desktop/src/lib/project/project.ts

@@ -1,5 +1,5 @@
 import { goto } from '$app/navigation';
-import { showToast } from '$lib/notifications/toasts';
+import { showError, showToast } from '$lib/notifications/toasts';
 import { projectPath } from '$lib/routes/routes.svelte';
 import { TestId } from '@gitbutler/ui';
 import type { ForgeName } from '$lib/forge/interface/forge';
@@ -162,10 +162,32 @@ export function handleAddProjectOutcome(
 			return true;
 		case 'notAGitRepository':
 			showToast({
-				testId: TestId.AddProjectNotAGitRepoModal,
-				style: 'warning',
 				title: 'Not a Git repository',
-				message: `Unable to add project: ${outcome.subject}`
+				message:
+					'The selected directory is not a Git repository. Would you like to initialize one?',
+				style: 'warning',
+				extraAction: {
+					label: 'Initialize Repository',
+					onClick: async (dismiss) => {
+						try {
+							const projectPath = 'get this - needs a refactor probably';
+							await projectsService.initGitRepository(projectPath);
+							dismiss();
+							showToast({
+								title: 'Repository Initialized',
+								message: `Git repository has been successfully initialized at ${projectPath}. Loading project...`,
+								style: 'info'
+							});
+							const projectId = 'TODO: get this from somewhere';
+							// Retry setting the project active
+							await setActiveProjectOrRedirect(projectId);
+						} catch (initError) {
+							console.error('Failed to initialize repository:', initError);
+							dismiss();
+							showError('Failed to initialize repository', initError);
+						}
+					}
+				}
 			});
 			return true;
 	}

apps/desktop/src/routes/[projectId]/+layout.svelte

@@ -12,7 +12,6 @@
 	import ReduxResult from '$components/ReduxResult.svelte';
 	import { OnboardingEvent, POSTHOG_WRAPPER } from '$lib/analytics/posthog';
 	import { BACKEND } from '$lib/backend';
-import { getUserErrorCode, Code } from '$lib/backend/ipc';
 	import { BASE_BRANCH_SERVICE } from '$lib/baseBranch/baseBranchService.svelte';
 	import { BRANCH_SERVICE } from '$lib/branches/branchService.svelte';
 	import { SETTINGS_SERVICE } from '$lib/config/appSettingsV2';
@@ -23,7 +22,7 @@ import { getUserErrorCode, Code } from '$lib/backend/ipc';
 	import { GITLAB_STATE } from '$lib/forge/gitlab/gitlabState.svelte';
 	import { GIT_SERVICE } from '$lib/git/gitService';
 	import { MODE_SERVICE } from '$lib/mode/modeService';
-	import { showError, showInfo, showWarning, showToast } from '$lib/notifications/toasts';
+	import { showError, showInfo, showWarning } from '$lib/notifications/toasts';
 	import { PROJECTS_SERVICE } from '$lib/project/projectsService';
 	import { FILE_SELECTION_MANAGER } from '$lib/selection/fileSelectionManager.svelte';
 	import { UNCOMMITTED_SERVICE } from '$lib/selection/uncommittedService.svelte';
@@ -321,44 +320,7 @@ import { getUserErrorCode, Code } from '$lib/backend/ipc';
 			}
 		} catch (error: unknown) {
 			posthog.captureOnboarding(OnboardingEvent.SetProjectActiveFailed);
-			
-			// Check if this is a non-git repository error
-			const errorCode = getUserErrorCode(error);
-			if (errorCode === Code.NonGitRepository) {
-				// Show special toast with git init option
-				showToast({
-					title: 'Not a Git repository',
-					message: 'The selected directory is not a Git repository. Would you like to initialize one?',
-					style: 'warning',
-					extraAction: {
-						label: 'Initialize Repository',
-						onClick: async (dismiss) => {
-							try {
-								const currentProject = projects?.find((p) => p.id === projectId);
-								if (currentProject?.path) {
-									await projectsService.initGitRepository(currentProject.path);
-									dismiss();
-									showToast({
-										title: 'Repository Initialized',
-										message: `Git repository has been successfully initialized at ${currentProject.path}. Loading project...`,
-										style: 'info'
-									});
-									// Retry setting the project active
-									await setActiveProjectOrRedirect(projectId);
-								} else {
-									throw new Error('Could not find project path');
-								}
-							} catch (initError) {
-								console.error('Failed to initialize repository:', initError);
-								dismiss();
-								showError('Failed to initialize repository', initError);
-							}
-						}
-					}
-				});
-			} else {
-				showError('Failed to set the project active', error);
-			}
+			showError('Failed to set the project active', error);
 		}
 	}
 

crates/gitbutler-error/src/error.rs

@@ -139,10 +139,6 @@ pub enum Code {
     SecretKeychainNotFound,
     MissingLoginKeychain,
     GitForcePushProtection,
-    /// When trying to open a project that is not in a git repository,
-    /// this error code is used to trigger special handling in the frontend.
-    /// The frontend will show a modal offering to initialize a git repository.
-    NonGitRepository,
 }
 
 impl std::fmt::Display for Code {
@@ -161,7 +157,6 @@ impl std::fmt::Display for Code {
             Code::SecretKeychainNotFound => "errors.secret.keychain_notfound",
             Code::MissingLoginKeychain => "errors.secret.missing_login_keychain",
             Code::GitForcePushProtection => "errors.git.force_push_protection",
-            Code::NonGitRepository => "errors.projects.not_git_repository",
         };
         f.write_str(code)
     }

crates/gitbutler-tauri/src/projects.rs

@@ -69,14 +69,6 @@ pub fn set_project_active(
             let err = anyhow::Error::from(err);
             if code == git2::ErrorCode::Owner {
                 err.context(gitbutler_error::error::Code::RepoOwnership)
-            } else if code == git2::ErrorCode::NotFound || 
-                      code == git2::ErrorCode::Invalid ||
-                      code == git2::ErrorCode::Config {
-                // Common error codes when a directory is not a git repository:
-                // - NotFound: .git directory or repository not found
-                // - Invalid: Invalid repository structure
-                // - Config: Repository configuration issues
-                err.context(gitbutler_error::error::Code::NonGitRepository)
             } else {
                 err
             }
@@ -225,33 +217,8 @@ Ensure these aren't touched by GitButler or avoid using it in this repository.",
 #[tauri::command]
 #[instrument(err(Debug))]
 pub fn init_git_repository(path: String) -> Result<(), Error> {
-    let repo_path = std::path::Path::new(&path);
-    
-    // Validate path
-    if !repo_path.exists() {
-        return Err(anyhow::anyhow!("Path does not exist: {}", path).into());
-    }
-    if !repo_path.is_dir() {
-        return Err(anyhow::anyhow!("Path is not a directory: {}", path).into());
-    }
-    
-    // Check if it's already a git repository
-    if git2::Repository::open(repo_path).is_ok() {
-        return Err(anyhow::anyhow!("Directory is already a Git repository").into());
-    }
-    
-    // Check if directory is writable
-    let temp_file = repo_path.join(".gitbutler_write_test");
-    if let Err(_) = std::fs::write(&temp_file, "test") {
-        return Err(anyhow::anyhow!("Directory is not writable: {}", path).into());
-    }
-    // Clean up test file
-    let _ = std::fs::remove_file(&temp_file);
-    
-    // Initialize the repository
-    git2::Repository::init(repo_path)
-        .with_context(|| format!("Failed to initialize Git repository at {}", path))?;
-    
-    tracing::info!("Successfully initialized Git repository at {}", path);
+    let path: PathBuf = path.into();
+    git2::Repository::init(&path)
+        .with_context(|| format!("Failed to initialize Git repository at {}", path.display()))?;
     Ok(())
 }