refactor

- cargo fmt

Author: Byron

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}

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 {

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"
  */

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 {

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]

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)?;

crates/but-core/src/tree/tests.rs

@@ -3,7 +3,7 @@ mod to_additive_hunks {
 
     #[test]
     fn rejected() {
-        let with = vec![hunk_header("-1,10", "+1,10")];
+        let wth = vec![hunk_header("-1,10", "+1,10")];
         insta::assert_debug_snapshot!(to_additive_hunks(
             [
                 // rejected as old is out of bounds
@@ -13,8 +13,8 @@ mod to_additive_hunks {
                 // rejected as it doesn't match any anchor point, nor does it match hunks without context
                 hunk_header("-0,0", "+2,10")
             ],
-            &with,
-            &with,
+            &wth,
+            &wth,
         ).unwrap(), @r#"
         (
             [],
@@ -29,15 +29,15 @@ mod to_additive_hunks {
 
     #[test]
     fn only_selections() {
-        let with = vec![hunk_header("-1,10", "+1,10")];
+        let wth = vec![hunk_header("-1,10", "+1,10")];
         insta::assert_debug_snapshot!(to_additive_hunks(
             [
                 hunk_header("-1,1", "+0,0"),
                 hunk_header("-5,2", "+0,0"),
                 hunk_header("-10,1", "+0,0")
             ],
-            &with,
-            &with,
+            &wth,
+            &wth,
         ).unwrap(), @r#"
         (
             [
@@ -54,8 +54,8 @@ mod to_additive_hunks {
                 hunk_header("-0,0", "+5,2"),
                 hunk_header("-0,0", "+10,1")
             ],
-            &with,
-            &with,
+            &wth,
+            &wth,
         ).unwrap(), @r#"
         (
             [
@@ -72,8 +72,8 @@ mod to_additive_hunks {
                 hunk_header("-5,2", "+0,0"),
                 hunk_header("-0,0", "+10,1")
             ],
-            &with,
-            &with,
+            &wth,
+            &wth,
         ).unwrap(), @r#"
         (
             [
@@ -90,8 +90,8 @@ mod to_additive_hunks {
                 hunk_header("-0,0", "+5,2"),
                 hunk_header("-10,1", "+0,0")
             ],
-            &with,
-            &with,
+            &wth,
+            &wth,
         ).unwrap(), @r#"
         (
             [
@@ -106,7 +106,7 @@ mod to_additive_hunks {
 
     #[test]
     fn selections_and_full_hunks() {
-        let with = vec![
+        let wth = vec![
             hunk_header("-1,10", "+1,10"),
             hunk_header("-15,5", "+20,5"),
             hunk_header("-25,5", "+40,5"),
@@ -120,8 +120,8 @@ mod to_additive_hunks {
                 hunk_header("-0,0", "+22,3"),
                 // Last hunk isn't used
             ],
-            &with,
-            &with,
+            &wth,
+            &wth,
         ).unwrap(), @r#"
         (
             [
@@ -136,7 +136,7 @@ mod to_additive_hunks {
 
     #[test]
     fn only_full_hunks() {
-        let with = vec![
+        let wth = vec![
             hunk_header("-1,10", "+1,10"),
             hunk_header("-15,5", "+20,5"),
             hunk_header("-25,5", "+40,5"),
@@ -148,8 +148,8 @@ mod to_additive_hunks {
                 hunk_header("-15,5", "+20,5"),
                 // Last hunk isn't used
             ],
-            &with,
-            &with,
+            &wth,
+            &wth,
         ).unwrap(), @r#"
         (
             [
@@ -180,7 +180,7 @@ mod to_additive_hunks {
         //  99
         // -100
         // +119
-        let with = vec![hunk_header("-93,8", "+93,10")];
+        let wth = vec![hunk_header("-93,8", "+93,10")];
 
         // diff --git a/file b/file
         // index 190423f..b513cb5 100644
@@ -203,7 +203,7 @@ mod to_additive_hunks {
 
         insta::assert_debug_snapshot!(to_additive_hunks(
             [hunk_header("-96,1", "+0,0")],
-            &with,
+            &wth,
             &wth0,
         ).unwrap(), @r#"
         (
@@ -215,7 +215,7 @@ mod to_additive_hunks {
         "#);
         insta::assert_debug_snapshot!(to_additive_hunks(
             [hunk_header("-96,1", "+0,0"), hunk_header("-0,0", "+96,2")],
-            &with,
+            &wth,
             &wth0,
         ).unwrap(), @r#"
         (
@@ -228,7 +228,7 @@ mod to_additive_hunks {
         "#);
         insta::assert_debug_snapshot!(to_additive_hunks(
             [hunk_header("-0,0", "+96,2")],
-            &with,
+            &wth,
             &wth0,
         ).unwrap(), @r#"
         (
@@ -242,7 +242,7 @@ mod to_additive_hunks {
 
     #[test]
     fn real_world_issue() {
-        let with = vec![hunk_header("-1,214", "+1,55")];
+        let wth = vec![hunk_header("-1,214", "+1,55")];
         let wth0 = vec![
             hunk_header("-4,13", "+4,0"),
             hunk_header("-18,19", "+5,1"),
@@ -262,7 +262,7 @@ mod to_additive_hunks {
                 hunk_header("-207,1", "+0,0"),
                 hunk_header("-209,3", "+0,0"),
             ],
-            &with,
+            &wth,
             &wth0,
         )
         .unwrap();
@@ -287,7 +287,7 @@ mod to_additive_hunks {
                 hunk_header("-209,1", "+0,0"),
                 hunk_header("-211,1", "+0,0"),
             ],
-            &with,
+            &wth,
             &wth0,
         )
         .unwrap();
@@ -316,7 +316,7 @@ mod to_additive_hunks {
                 hunk_header("-0,0", "+30,2"),
                 hunk_header("-0,0", "+50,3"),
             ],
-            &with,
+            &wth,
             &wth0,
         )
         .unwrap();
@@ -337,7 +337,7 @@ mod to_additive_hunks {
 
     #[test]
     fn only_selections_workspace_example() {
-        let with = vec![hunk_header("-1,10", "+1,10")];
+        let wth = vec![hunk_header("-1,10", "+1,10")];
         let actual = to_additive_hunks(
             [
                 // commit NOT '2,3' of the old
@@ -355,8 +355,8 @@ mod to_additive_hunks {
                 // commit '19,20' of the new
                 hunk_header("-0,0", "+9,2"),
             ],
-            &with,
-            &with,
+            &wth,
+            &wth,
         )
         .unwrap();
         insta::assert_debug_snapshot!(actual, @r#"

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),

crates/but-workspace/tests/workspace/commit_engine/refs_update.rs

@@ -1506,11 +1506,11 @@ fn commit_on_top_of_branch_in_workspace() -> anyhow::Result<()> {
     let rewritten_head_id = repo.head_id()?;
     // The empty commit was inserted.
     insta::assert_snapshot!(visualize_commit_graph(&repo, rewritten_head_id)?, @r"
-    *   4e7e322 (HEAD -> merge) Merge branch 'A' into merge
+    *   f3de308 (HEAD -> merge) Merge branch 'A' into merge
     |\  
     | * 608f07b (s1-b/top) remove 5 lines from beginning
     | * 7f389ed (s1-b/below-top, A) add 10 to the beginning
-    * | 262b17d (s2-b/top) empty commit
+    * | e43241c (s2-b/top) empty commit
     * | b5ec010 remove 5 lines from the end
     * | 91ef6f6 (s2-b/below-top, B) add 10 to the end
     |/  

crates/but-workspace/tests/workspace/ref_info/with_workspace_commit/journey/exhaustive_with_squash_merges.rs

@@ -868,9 +868,9 @@ The remote was reused and merged once more with more changes.
     | * 9a2fcdf two
     |/  
     * 3234835 one
-    | * 8965172 (origin/main) other remote file changed completely afterwards
-    | * 9096eba squash origin/S1
-    | * ccaef5a avoid merge conflict
+    | * 35faa22 (origin/main) other remote file changed completely afterwards
+    | * 293873a squash origin/S1
+    | * 4ac7bc7 avoid merge conflict
     | * adc9f0c (main) file changed completely afterwards
     | * d110262 squash S1
     |/  
@@ -974,11 +974,11 @@ A new multi-segment stack is created without remote and squash merged locally.
     |/|   
     * | 3234835 one
     |/  
-    | * 639afcf (origin/main) local file rewritten completely
-    | * ca783a4 squash local
-    | * 8965172 (main) other remote file changed completely afterwards
-    | * 9096eba squash origin/S1
-    | * ccaef5a avoid merge conflict
+    | * 350fd89 (origin/main) local file rewritten completely
+    | * 2eb07c5 squash local
+    | * 35faa22 (main) other remote file changed completely afterwards
+    | * 293873a squash origin/S1
+    | * 4ac7bc7 avoid merge conflict
     | * adc9f0c file changed completely afterwards
     | * d110262 squash S1
     |/  
@@ -1041,7 +1041,7 @@ A new multi-segment stack is created without remote and squash merged locally.
                             ref_name: "►local",
                             remote_tracking_ref_name: "None",
                             commits: [
-                                LocalCommit(1af5d57, "new local file\n", integrated(ca783a4)),
+                                LocalCommit(1af5d57, "new local file\n", integrated(2eb07c5)),
                             ],
                             commits_on_remote: [],
                             commits_outside: None,
@@ -1054,7 +1054,7 @@ A new multi-segment stack is created without remote and squash merged locally.
                             ref_name: "►local-bottom",
                             remote_tracking_ref_name: "None",
                             commits: [
-                                LocalCommit(de02b20, "new local-bottom file\n", integrated(ca783a4)),
+                                LocalCommit(de02b20, "new local-bottom file\n", integrated(2eb07c5)),
                             ],
                             commits_on_remote: [],
                             commits_outside: None,
@@ -1076,7 +1076,7 @@ A new multi-segment stack is created without remote and squash merged locally.
             ),
             target_commit: Some(
                 TargetCommit {
-                    commit_id: Sha1(8965172e9a9c1649a2f87e645ae42ffb7f11680c),
+                    commit_id: Sha1(35faa22c8d0a01ba45da3971406eab6932b1bbde),
                     segment_index: NodeIndex(2),
                 },
             ),