refactor

Byron · Byron · commit 0bf121198216 · 2025-12-04T17:43:57.000+01:00
- cargo fmt
diff --git a/apps/desktop/src/components/UnifiedDiffView.svelte b/apps/desktop/src/components/UnifiedDiffView.svelte
@@ -67,7 +67,7 @@
 	const projectState = $derived(uiState.project(projectId));
 	const exclusiveAction = $derived(projectState.exclusiveAction.current);
 
-	const isCommiting = $derived(
+	const isCommitting = $derived(
 		exclusiveAction?.type === 'commit' && selectionId.type === 'worktree'
 	);
 
@@ -214,7 +214,7 @@
 					>
 						<HunkDiff
 							draggingDisabled={!draggable}
-							hideCheckboxes={!isCommiting}
+							hideCheckboxes={!isCommitting}
 							filePath={change.path}
 							hunkStr={hunk.diff}
 							staged={selection.current.selected}
diff --git a/apps/desktop/src/lib/actions/types.ts b/apps/desktop/src/lib/actions/types.ts
@@ -137,7 +137,7 @@ export type Trigger =
 export type Status =
 	| { readonly type: 'completed' }
 	| { readonly type: 'failed'; readonly subject: string }
-	| { readonly type: 'interupted'; readonly subject: string };
+	| { readonly type: 'interrupted'; readonly subject: string };
 
 /** Represents a workflow that was executed by GitButler. */
 export class Workflow {
diff --git a/apps/desktop/src/lib/updater/updater.ts b/apps/desktop/src/lib/updater/updater.ts
@@ -42,7 +42,7 @@ export const UPDATE_INTERVAL_MS = 3600000; // Hourly
  * Note that the Tauri API `checkUpdate` hangs indefinitely in dev mode, build
  * a nightly if you want to test the updater manually.
  *
- * export TAURI_SIGNING_PRIVATE_KEY=does not
+ * export TAURI_SIGNING_PRIVATE_KEY=doesnot
  * export TAURI_SIGNING_PRIVATE_KEY_PASSWORD=matter
  * ./scripts/release.sh --channel nightly --version "0.5.678"
  */
diff --git a/apps/web/src/lib/components/service/FullscreenIllustrationCard.svelte b/apps/web/src/lib/components/service/FullscreenIllustrationCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import walkingSvg from '$lib/assets/splash-illustrations/walking.svg?raw';
+	import walkingSvg from '$lib/assets/splash-illustrations/walkin.svg?raw';
 	import type { Snippet } from 'svelte';
 
 	interface Props {
diff --git a/crates/but-api/src/legacy/repo.rs b/crates/but-api/src/legacy/repo.rs
@@ -60,9 +60,9 @@ async fn handle_git_prompt_clone(prompt: String, url: String) -> Option<String>
 
 #[but_api]
 #[instrument(err(Debug))]
-pub fn get_uncommited_files(project_id: ProjectId) -> Result<Vec<RemoteBranchFile>> {
+pub fn get_uncommitted_files(project_id: ProjectId) -> Result<Vec<RemoteBranchFile>> {
     let ctx = Context::new_from_legacy_project_id(project_id)?;
-    gitbutler_branch_actions::get_uncommited_files(&ctx)
+    gitbutler_branch_actions::get_uncommitted_files(&ctx)
 }
 
 #[but_api]
diff --git a/crates/but-cherry-apply/src/lib.rs b/crates/but-cherry-apply/src/lib.rs
@@ -34,7 +34,7 @@ use but_rebase::Rebase;
 use but_workspace::legacy::{StacksFilter, stack_ext::StackExt, stacks_v3};
 use gitbutler_branch_actions::update_workspace_commit;
 use gitbutler_stack::VirtualBranchesHandle;
-use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommited_changes};
+use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommitted_changes};
 use gix::{ObjectId, Repository};
 use serde::Serialize;
 
@@ -139,7 +139,7 @@ pub fn cherry_apply(
 
     {
         let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
-        update_uncommited_changes(ctx, old_workspace, new_workspace, perm)?;
+        update_uncommitted_changes(ctx, old_workspace, new_workspace, perm)?;
     }
 
     update_workspace_commit(&vb_state, ctx, false)?;
diff --git a/crates/but-server/src/lib.rs b/crates/but-server/src/lib.rs
@@ -343,7 +343,7 @@ async fn handle_command(
         "git_set_local_config" => legacy::repo::git_set_local_config_cmd(request.params),
         "check_signing_settings" => legacy::repo::check_signing_settings_cmd(request.params),
         "git_clone_repository" => legacy::repo::git_clone_repository_cmd(request.params).await,
-        "get_uncommited_files" => legacy::repo::get_uncommited_files_cmd(request.params),
+        "get_uncommitted_files" => legacy::repo::get_uncommitted_files_cmd(request.params),
         "get_commit_file" => legacy::repo::get_commit_file_cmd(request.params),
         "get_workspace_file" => legacy::repo::get_workspace_file_cmd(request.params),
         "find_files" => legacy::repo::find_files_cmd(request.params),
diff --git a/crates/but-worktrees/src/integrate.rs b/crates/but-worktrees/src/integrate.rs
@@ -11,7 +11,7 @@ use but_workspace::legacy::stack_ext::StackExt;
 use gitbutler_branch_actions::update_workspace_commit;
 use gitbutler_stack::{Stack, VirtualBranchesHandle};
 use gitbutler_workspace::branch_trees::{
-    WorkspaceState, merge_workspace, move_tree, update_uncommited_changes,
+    WorkspaceState, merge_workspace, move_tree, update_uncommitted_changes,
 };
 use gix::prelude::ObjectIdExt as _;
 use serde::{Deserialize, Serialize};
@@ -75,7 +75,7 @@ pub fn worktree_integrate(
         .stack
         .set_heads_from_rebase_output(ctx, status.rebase_output.references)?;
     let after = WorkspaceState::create(ctx, perm.read_permission())?;
-    update_uncommited_changes(ctx, before, after, perm)?;
+    update_uncommitted_changes(ctx, before, after, perm)?;
     let vb_state = VirtualBranchesHandle::new(ctx.project_data_dir());
     update_workspace_commit(&vb_state, ctx, false)?;
 
diff --git a/crates/gitbutler-branch-actions/src/actions.rs b/crates/gitbutler-branch-actions/src/actions.rs
@@ -516,9 +516,9 @@ pub fn create_virtual_branch_from_branch(
     )
 }
 
-pub fn get_uncommited_files(ctx: &Context) -> Result<Vec<RemoteBranchFile>> {
+pub fn get_uncommitted_files(ctx: &Context) -> Result<Vec<RemoteBranchFile>> {
     let guard = ctx.exclusive_worktree_access();
-    crate::branch::get_uncommited_files(ctx, guard.read_permission())
+    crate::branch::get_uncommitted_files(ctx, guard.read_permission())
 }
 
 pub fn upstream_integration_statuses(
diff --git a/crates/gitbutler-branch-actions/src/branch_manager/branch_creation.rs b/crates/gitbutler-branch-actions/src/branch_manager/branch_creation.rs
@@ -20,7 +20,7 @@ use gitbutler_repo::{RepositoryExt as _, rebase::gitbutler_merge_commits};
 use gitbutler_repo_actions::RepoActionsExt;
 use gitbutler_stack::{BranchOwnershipClaims, Stack, StackId};
 use gitbutler_time::time::now_since_unix_epoch_ms;
-use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommited_changes_with_tree};
+use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommitted_changes_with_tree};
 use serde::Serialize;
 use tracing::instrument;
 
@@ -509,7 +509,7 @@ impl BranchManager<'_> {
 
         // Permissions here might be wonky, just go with it though.
         let new_workspace = WorkspaceState::create(self.ctx, perm.read_permission())?;
-        let res = update_uncommited_changes_with_tree(
+        let res = update_uncommitted_changes_with_tree(
             self.ctx,
             workspace_state,
             new_workspace,
diff --git a/crates/gitbutler-branch-actions/src/branch_upstream_integration.rs b/crates/gitbutler-branch-actions/src/branch_upstream_integration.rs
@@ -5,7 +5,7 @@ use but_oxidize::ObjectIdExt;
 use but_rebase::{Rebase, RebaseStep};
 use but_workspace::{legacy::stack_ext::StackExt, ui::CommitState};
 use gitbutler_stack::{StackId, VirtualBranchesHandle};
-use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommited_changes};
+use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommitted_changes};
 use gix::ObjectId;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
@@ -172,7 +172,7 @@ pub fn integrate_branch_with_steps(
 
     source_stack.set_stack_head(&vb_state, &repository, head, None)?;
     let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
-    update_uncommited_changes(ctx, old_workspace, new_workspace, perm)?;
+    update_uncommitted_changes(ctx, old_workspace, new_workspace, perm)?;
     source_stack.set_heads_from_rebase_output(ctx, result.references)?;
 
     crate::integration::update_workspace_commit(&vb_state, ctx, false)?;
diff --git a/crates/gitbutler-branch-actions/src/lib.rs b/crates/gitbutler-branch-actions/src/lib.rs
@@ -4,7 +4,7 @@ mod actions;
 pub use actions::{
     amend, can_apply_remote_branch, create_commit, create_virtual_branch,
     create_virtual_branch_from_branch, delete_local_branch, fetch_from_remotes, find_commit,
-    find_git_branches, get_initial_integration_steps_for_branch, get_uncommited_files,
+    find_git_branches, get_initial_integration_steps_for_branch, get_uncommitted_files,
     insert_blank_commit, integrate_branch_with_steps, integrate_upstream,
     integrate_upstream_commits, list_commit_files, move_branch, move_commit, push_base_branch,
     reorder_stack, resolve_upstream_integration, set_base_branch, set_target_push_remote,
diff --git a/crates/gitbutler-branch-actions/src/move_branch.rs b/crates/gitbutler-branch-actions/src/move_branch.rs
@@ -8,7 +8,7 @@ use but_workspace::legacy::stack_ext::StackExt;
 use gitbutler_cherry_pick::GixRepositoryExt;
 use gitbutler_reference::{LocalRefname, Refname};
 use gitbutler_stack::{StackBranch, VirtualBranchesHandle};
-use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommited_changes};
+use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommitted_changes};
 use gix::refs::transaction::PreviousValue;
 use serde::Serialize;
 
@@ -72,7 +72,7 @@ pub(crate) fn move_branch(
     )?;
 
     let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
-    let _ = update_uncommited_changes(ctx, old_workspace, new_workspace, perm);
+    let _ = update_uncommitted_changes(ctx, old_workspace, new_workspace, perm);
     crate::integration::update_workspace_commit(&vb_state, ctx, false)
         .context("failed to update gitbutler workspace")?;
 
@@ -128,7 +128,7 @@ pub(crate) fn tear_off_branch(
     )?;
 
     let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
-    let _ = update_uncommited_changes(ctx, old_workspace, new_workspace, perm);
+    let _ = update_uncommitted_changes(ctx, old_workspace, new_workspace, perm);
     crate::integration::update_workspace_commit(&vb_state, ctx, false)
         .context("failed to update gitbutler workspace")?;
 
diff --git a/crates/gitbutler-branch-actions/src/move_commits.rs b/crates/gitbutler-branch-actions/src/move_commits.rs
@@ -7,7 +7,7 @@ use but_rebase::RebaseStep;
 use but_workspace::legacy::stack_ext::StackExt;
 use gitbutler_hunk_dependency::locks::HunkDependencyResult;
 use gitbutler_stack::{StackId, VirtualBranchesHandle};
-use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommited_changes};
+use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommitted_changes};
 use serde::Serialize;
 
 use crate::{
@@ -73,7 +73,7 @@ pub(crate) fn move_commit(
 
     let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
     // Even if this fails, it's not actionable
-    let _ = update_uncommited_changes(ctx, old_workspace, new_workspace, perm);
+    let _ = update_uncommitted_changes(ctx, old_workspace, new_workspace, perm);
     crate::integration::update_workspace_commit(&vb_state, ctx, false)
         .context("failed to update gitbutler workspace")?;
 
diff --git a/crates/gitbutler-branch-actions/src/reorder.rs b/crates/gitbutler-branch-actions/src/reorder.rs
@@ -4,7 +4,7 @@ use but_oxidize::{ObjectIdExt, OidExt};
 use but_rebase::{RebaseOutput, RebaseStep};
 use git2::Oid;
 use gitbutler_stack::{Stack, StackId};
-use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommited_changes};
+use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommitted_changes};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 
@@ -70,7 +70,7 @@ pub fn reorder_stack(
 
     let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
     // Even if this fails, it's not actionable
-    let _ = update_uncommited_changes(ctx, old_workspace, new_workspace, perm);
+    let _ = update_uncommitted_changes(ctx, old_workspace, new_workspace, perm);
     crate::integration::update_workspace_commit(&state, ctx, false)
         .context("failed to update gitbutler workspace")?;
 
diff --git a/crates/gitbutler-branch-actions/src/squash.rs b/crates/gitbutler-branch-actions/src/squash.rs
@@ -12,7 +12,7 @@ use gitbutler_repo::{
     logging::{LogUntil, RepositoryExt},
 };
 use gitbutler_stack::StackId;
-use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommited_changes};
+use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommitted_changes};
 use itertools::Itertools;
 
 use crate::{
@@ -263,7 +263,7 @@ fn do_squash_commits(
     stack.set_stack_head(&vb_state, &gix_repo, new_stack_head, None)?;
 
     let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
-    update_uncommited_changes(ctx, old_workspace, new_workspace, perm)?;
+    update_uncommitted_changes(ctx, old_workspace, new_workspace, perm)?;
     crate::integration::update_workspace_commit(&vb_state, ctx, false)
         .context("failed to update gitbutler workspace")?;
     stack.set_heads_from_rebase_output(ctx, output.references)?;
diff --git a/crates/gitbutler-branch-actions/src/upstream_integration.rs b/crates/gitbutler-branch-actions/src/upstream_integration.rs
@@ -16,7 +16,7 @@ use gitbutler_repo::{
     rebase::gitbutler_merge_commits,
 };
 use gitbutler_stack::{StackId, Target, VirtualBranchesHandle};
-use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommited_changes};
+use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommitted_changes};
 use gix::merge::tree::TreatAsUnresolved;
 use serde::{Deserialize, Serialize};
 
@@ -654,7 +654,7 @@ pub(crate) fn integrate_upstream(
 
         {
             let new_workspace = WorkspaceState::create(ctx, permission.read_permission())?;
-            update_uncommited_changes(ctx, old_workspace, new_workspace, permission)?;
+            update_uncommitted_changes(ctx, old_workspace, new_workspace, permission)?;
         }
 
         crate::integration::update_workspace_commit(&virtual_branches_state, ctx, false)?;
diff --git a/crates/gitbutler-edit-mode/src/lib.rs b/crates/gitbutler-edit-mode/src/lib.rs
@@ -22,7 +22,7 @@ use gitbutler_operating_modes::{
 };
 use gitbutler_repo::{RepositoryExt, SignaturePurpose, signature};
 use gitbutler_stack::VirtualBranchesHandle;
-use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommited_changes_with_tree};
+use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommitted_changes_with_tree};
 use serde::Serialize;
 
 pub mod commands;
@@ -287,7 +287,7 @@ pub(crate) fn save_and_return_to_workspace(
     let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
     let uncommtied_changes = get_uncommited_changes(ctx)?;
 
-    update_uncommited_changes_with_tree(
+    update_uncommitted_changes_with_tree(
         ctx,
         old_workspace,
         new_workspace,
diff --git a/crates/gitbutler-tauri/src/main.rs b/crates/gitbutler-tauri/src/main.rs
@@ -237,7 +237,7 @@ fn main() -> anyhow::Result<()> {
                 legacy::repo::tauri_git_set_local_config::git_set_local_config,
                 legacy::repo::tauri_check_signing_settings::check_signing_settings,
                 legacy::repo::tauri_git_clone_repository::git_clone_repository,
-                legacy::repo::tauri_get_uncommited_files::get_uncommited_files,
+                legacy::repo::tauri_get_uncommitted_files::get_uncommitted_files,
                 legacy::repo::tauri_get_commit_file::get_commit_file,
                 legacy::repo::tauri_get_workspace_file::get_workspace_file,
                 legacy::repo::tauri_find_files::find_files,
diff --git a/crates/gitbutler-workspace/src/branch_trees.rs b/crates/gitbutler-workspace/src/branch_trees.rs
@@ -99,7 +99,8 @@ pub fn update_uncommitted_changes_with_tree(
 ) -> Result<()> {
     let repo = &*ctx.git2_repo.get()?;
     if let Some(worktree_id) = old_uncommitted_changes {
-        let mut new_uncommitted_changes = move_tree_between_workspaces(repo, worktree_id, old, new)?;
+        let mut new_uncommitted_changes =
+            move_tree_between_workspaces(repo, worktree_id, old, new)?;
 
         // If the new tree and old tree are the same, then we don't need to do anything
         if !new_uncommitted_changes.has_conflicts() && !always_checkout.unwrap_or(false) {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export const UPDATE_INTERVAL_MS = 3600000; // Hourly`
`42`	`42`	* Note that the Tauri API `checkUpdate` hangs indefinitely in dev mode, build
`43`	`43`	`* a nightly if you want to test the updater manually.`
`44`	`44`	`*`
`45`		`- * export TAURI_SIGNING_PRIVATE_KEY=does not`
	`45`	`+ * export TAURI_SIGNING_PRIVATE_KEY=doesnot`
`46`	`46`	`* export TAURI_SIGNING_PRIVATE_KEY_PASSWORD=matter`
`47`	`47`	`* ./scripts/release.sh --channel nightly --version "0.5.678"`
`48`	`48`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ use but_rebase::Rebase;`
`34`	`34`	`use but_workspace::legacy::{StacksFilter, stack_ext::StackExt, stacks_v3};`
`35`	`35`	`use gitbutler_branch_actions::update_workspace_commit;`
`36`	`36`	`use gitbutler_stack::VirtualBranchesHandle;`
`37`		`-use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommited_changes};`
	`37`	`+use gitbutler_workspace::branch_trees::{WorkspaceState, update_uncommitted_changes};`
`38`	`38`	`use gix::{ObjectId, Repository};`
`39`	`39`	`use serde::Serialize;`
`40`	`40`
`@@ -139,7 +139,7 @@ pub fn cherry_apply(`
`139`	`139`
`140`	`140`	`{`
`141`	`141`	`let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;`
`142`		`- update_uncommited_changes(ctx, old_workspace, new_workspace, perm)?;`
	`142`	`+ update_uncommitted_changes(ctx, old_workspace, new_workspace, perm)?;`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`update_workspace_commit(&vb_state, ctx, false)?;`
Original file line number	Diff line number	Diff line change
`@@ -516,9 +516,9 @@ pub fn create_virtual_branch_from_branch(`
`516`	`516`	`)`
`517`	`517`	`}`
`518`	`518`
`519`		`-pub fn get_uncommited_files(ctx: &Context) -> Result<Vec<RemoteBranchFile>> {`
	`519`	`+pub fn get_uncommitted_files(ctx: &Context) -> Result<Vec<RemoteBranchFile>> {`
`520`	`520`	`let guard = ctx.exclusive_worktree_access();`
`521`		`- crate::branch::get_uncommited_files(ctx, guard.read_permission())`
	`521`	`+ crate::branch::get_uncommitted_files(ctx, guard.read_permission())`
`522`	`522`	`}`
`523`	`523`
`524`	`524`	`pub fn upstream_integration_statuses(`