From 6b8c3803568e0c1b156dbe3df07382202c446f06 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 15:17:30 +0000
Subject: [PATCH 1/2] Fix spelling and grammatical errors across repository
Co-authored-by: Byron <63622+Byron@users.noreply.github.com>
---
apps/desktop/README.md | 2 +-
apps/desktop/cypress/e2e/branches.cy.ts | 2 +-
apps/desktop/cypress/e2e/errorHandling.cy.ts | 4 +-
apps/desktop/cypress/e2e/selection.cy.ts | 12 ++--
.../desktop/cypress/e2e/unifiedDiffView.cy.ts | 2 +-
apps/desktop/cypress/e2e/workspace.cy.ts | 2 +-
.../src/components/BranchHeader.svelte | 2 +-
apps/desktop/src/components/ChunkyList.svelte | 2 +-
.../src/components/CommitLineOverlay.svelte | 8 +--
.../src/components/DraftBranchHeader.svelte | 2 +-
apps/desktop/src/components/Drawer.svelte | 2 +-
.../src/components/GithubIntegration.svelte | 2 +-
.../components/IntegrateUpstreamModal.svelte | 4 +-
.../src/components/MultiStackView.svelte | 2 +-
.../desktop/src/components/NewRuleMenu.svelte | 2 +-
.../src/components/PullRequestCard.svelte | 4 +-
apps/desktop/src/components/Resizer.svelte | 2 +-
.../components/editor/MessageEditor.svelte | 2 +-
.../projectSettings/AppearanceSettings.svelte | 2 +-
apps/desktop/src/components/test/readme.md | 2 +-
apps/desktop/src/lib/actions/types.ts | 2 +-
apps/desktop/src/lib/ai/prompts.ts | 2 +-
apps/desktop/src/lib/ai/service.ts | 2 +-
apps/desktop/src/lib/backend/clipboard.ts | 2 +-
apps/desktop/src/lib/backend/web.ts | 2 +-
apps/desktop/src/lib/branches/branch.ts | 2 +-
.../desktop/src/lib/branches/branchListing.ts | 10 ++--
apps/desktop/src/lib/codegen/messages.ts | 2 +-
apps/desktop/src/lib/commits/dropHandler.ts | 2 +-
.../src/lib/dependencies/dependencies.ts | 4 +-
apps/desktop/src/lib/dragging/registry.ts | 2 +-
apps/desktop/src/lib/files/filetreeV3.ts | 2 +-
apps/desktop/src/lib/forge/gitlab/types.ts | 4 +-
.../desktop/src/lib/forge/prPolling.svelte.ts | 2 +-
apps/desktop/src/lib/forge/shared/prFooter.ts | 2 +-
.../src/lib/history/oplogService.svelte.ts | 2 +-
apps/desktop/src/lib/hunks/change.ts | 4 +-
apps/desktop/src/lib/irc/ircClient.svelte.ts | 2 +-
apps/desktop/src/lib/notifications/toasts.ts | 2 +-
.../src/lib/selection/entityAdapters.ts | 2 +-
apps/desktop/src/lib/selection/uncommitted.ts | 6 +-
.../selection/uncommittedService.svelte.ts | 2 +-
apps/desktop/src/lib/soup/commitAnalytics.ts | 2 +-
apps/desktop/src/lib/stacks/macros.ts | 2 +-
.../src/lib/stacks/stackService.svelte.ts | 10 ++--
apps/desktop/src/lib/state/butlerModule.ts | 2 +-
apps/desktop/src/lib/state/helpers.test.ts | 8 +--
apps/desktop/src/lib/updater/updater.ts | 2 +-
apps/desktop/src/lib/user/userService.ts | 2 +-
.../desktop/src/lib/utils/unsubscribe.test.ts | 6 +-
.../routes/[projectId]/history/+page.svelte | 2 +-
.../src/routes/onboarding/+page.svelte | 2 +-
.../components/infoFlexRow/InfoFlexRow.svelte | 2 +-
.../components/review/ReviewSections.svelte | 2 +-
.../lib/components/rules/RulesModal.svelte | 2 +-
.../service/FullscreenIllustrationCard.svelte | 4 +-
.../src/lib/components/table/TableRow.svelte | 2 +-
.../reviews/[branchId]/+page.svelte | 2 +-
crates/but-action/src/absorb.rs | 10 ++--
crates/but-action/src/auto_commit.rs | 2 +-
crates/but-action/src/branch_changes.rs | 2 +-
crates/but-action/src/generate.rs | 2 +-
crates/but-action/src/lib.rs | 4 +-
crates/but-action/src/simple.rs | 2 +-
crates/but-action/src/workflow.rs | 2 +-
crates/but-api/src/json.rs | 2 +-
crates/but-api/src/legacy/oplog.rs | 6 +-
crates/but-api/src/legacy/workspace.rs | 2 +-
crates/but-bot/src/butbot.rs | 4 +-
crates/but-bot/src/state.rs | 4 +-
crates/but-cherry-apply/src/lib.rs | 4 +-
crates/but-claude/src/bridge.rs | 4 +-
crates/but-claude/src/compact.rs | 6 +-
crates/but-claude/src/hooks/mod.rs | 6 +-
crates/but-claude/src/legacy.rs | 2 +-
crates/but-claude/src/lib.rs | 2 +-
crates/but-claude/src/permissions/patterns.rs | 4 +-
crates/but-claude/src/prompt_templates.rs | 2 +-
crates/but-claude/src/rules.rs | 2 +-
crates/but-core/src/branch.rs | 2 +-
crates/but-core/src/diff/worktree.rs | 2 +-
crates/but-core/src/lib.rs | 2 +-
crates/but-core/src/settings.rs | 2 +-
crates/but-core/src/tree/tests.rs | 58 +++++++++----------
.../src/worktree/checkout/function.rs | 2 +-
crates/but-cursor/src/lib.rs | 6 +-
crates/but-debugging/src/lib.rs | 6 +-
crates/but-error/src/lib.rs | 4 +-
crates/but-graph/src/init/post.rs | 2 +-
crates/but-graph/src/lib.rs | 2 +-
crates/but-graph/src/projection/workspace.rs | 2 +-
crates/but-graph/tests/fixtures/scenarios.sh | 14 ++---
.../tests/graph/init/with_workspace.rs | 54 ++++++++---------
crates/but-hunk-dependency/src/input.rs | 2 +-
crates/but-hunk-dependency/src/ranges/hunk.rs | 2 +-
crates/but-hunk-dependency/src/ranges/mod.rs | 2 +-
.../but-hunk-dependency/src/ranges/paths.rs | 2 +-
crates/but-rebase/src/cherry_pick.rs | 2 +-
crates/but-rebase/src/commit.rs | 4 +-
crates/but-rebase/src/merge.rs | 2 +-
crates/but-rules/src/lib.rs | 4 +-
crates/but-status/src/lib.rs | 2 +-
crates/but-tools/src/workspace.rs | 34 +++++------
.../bindings/workspace/refInfo/index.ts | 2 +-
crates/but-workspace/src/branch/apply.rs | 4 +-
crates/but-workspace/src/branch_details.rs | 10 ++--
crates/but-workspace/src/changeset.rs | 2 +-
crates/but-workspace/src/commit.rs | 2 +-
.../src/legacy/branch_details.rs | 10 ++--
crates/but-workspace/src/legacy/stacks.rs | 12 ++--
.../tree_manipulation/move_between_commits.rs | 14 ++---
.../remove_changes_from_commit_in_stack.rs | 6 +-
.../src/legacy/tree_manipulation/utils.rs | 4 +-
.../discard_worktree_changes.rs | 2 +-
crates/but-workspace/src/ui/ref_info.rs | 2 +-
.../tests/fixtures/scenario/journey01.sh | 6 +-
.../no-ws-ref-stack-and-dependent-branch.sh | 2 +-
.../scenario/with-remotes-and-workspace.sh | 14 ++---
.../workspace/branch/create_reference.rs | 4 +-
.../workspace/commit_engine/refs_update.rs | 4 +-
.../journey/exhaustive_with_squash_merges.rs | 10 ++--
.../ref_info/with_workspace_commit/legacy.rs | 10 ++--
.../ref_info/with_workspace_commit/mod.rs | 36 ++++++------
.../tests/workspace/tree_manipulation/file.rs | 2 +-
crates/but-worktrees/src/git.rs | 2 +-
crates/but-worktrees/src/integrate.rs | 2 +-
.../but-worktrees/tests/worktree/integrate.rs | 4 +-
crates/but/src/args/mod.rs | 6 +-
crates/but/src/command/legacy/absorb.rs | 2 +-
crates/but/src/command/legacy/forge/review.rs | 2 +-
crates/but/src/command/legacy/mark.rs | 2 +-
crates/but/src/command/legacy/status/json.rs | 2 +-
crates/but/src/legacy/id/mod.rs | 4 +-
crates/but/src/tui/select_branch/mod.rs | 2 +-
crates/gitbutler-branch-actions/src/branch.rs | 16 ++---
.../src/dependencies.rs | 2 +-
crates/gitbutler-branch-actions/src/hunk.rs | 2 +-
.../src/move_commits.rs | 2 +-
.../gitbutler-branch-actions/src/reorder.rs | 2 +-
crates/gitbutler-branch-actions/src/squash.rs | 2 +-
crates/gitbutler-branch-actions/src/stack.rs | 2 +-
.../src/upstream_integration.rs | 6 +-
.../gitbutler-branch-actions/src/virtual.rs | 2 +-
.../tests/dependencies.rs | 10 ++--
.../tests/fixtures/branch-details-benches.sh | 20 +++----
.../tests/fixtures/for-details.sh | 2 +-
.../gitbutler-branch-actions/tests/reorder.rs | 2 +-
.../virtual_branches/apply_virtual_branch.rs | 4 +-
.../tests/virtual_branches/init.rs | 8 +--
.../tests/virtual_branches/list.rs | 2 +-
.../tests/virtual_branches/list_details.rs | 2 +-
crates/gitbutler-cli/src/args.rs | 4 +-
.../vendor/debouncer/src/lib.rs | 2 +-
.../fixtures/add_create_dir_event_twice.hjson | 2 +-
crates/gitbutler-git/src/executor/mod.rs | 4 +-
crates/gitbutler-hunk-dependency/README.md | 14 ++---
crates/gitbutler-hunk-dependency/src/path.rs | 2 +-
.../src/workspace.rs | 2 +-
crates/gitbutler-oplog/src/reflog.rs | 2 +-
crates/gitbutler-project/src/project.rs | 2 +-
crates/gitbutler-repo/src/repository_ext.rs | 2 +-
crates/gitbutler-stack/src/lib.rs | 2 +-
crates/gitbutler-stack/src/stack.rs | 10 ++--
crates/gitbutler-stack/src/stack_branch.rs | 4 +-
crates/gitbutler-stack/src/state.rs | 2 +-
crates/gitbutler-sync/src/stack_upload.rs | 6 +-
.../com.gitbutler.gitbutler.metainfo.xml | 2 +-
crates/gitbutler-tauri/src/logs.rs | 2 +-
crates/gitbutler-tauri/src/projects.rs | 2 +-
.../gitbutler-workspace/src/branch_trees.rs | 24 ++++----
.../tests/upstreamIntegration.spec.ts | 2 +-
.../src/generated/workspace/refInfo/index.ts | 2 +-
.../src/noRelativeImportPaths.test.ts | 2 +-
packages/no-relative-imports/src/paths.ts | 2 +-
.../shared/src/lib/interest/interestStore.ts | 4 +-
packages/shared/src/lib/network/loadable.ts | 2 +-
.../src/lib/patchEvents/patchEventsService.ts | 2 +-
packages/shared/src/lib/polling.ts | 2 +-
packages/shared/src/lib/redux/store.svelte.ts | 2 +-
packages/shared/src/lib/storeUtils.ts | 4 +-
.../ui/src/lib/components/file/fileIcons.ts | 2 +-
.../ui/src/lib/richText/RichTextEditor.svelte | 2 +-
packages/ui/src/lib/utils/diffParsing.ts | 6 +-
packages/ui/src/stories/docs/colors.mdx | 6 +-
184 files changed, 433 insertions(+), 433 deletions(-)
diff --git a/apps/desktop/README.md b/apps/desktop/README.md
index 4dc17fb90c..e1640efcbe 100644
--- a/apps/desktop/README.md
+++ b/apps/desktop/README.md
@@ -18,7 +18,7 @@ Execute the following command on your terminal \
cargo run -p but-server
```
-This shoud start the server on th default port 6978
+This should start the server on th default port 6978
#### 2. Run the FE dev server
diff --git a/apps/desktop/cypress/e2e/branches.cy.ts b/apps/desktop/cypress/e2e/branches.cy.ts
index 139fd7f63f..c126cab1cc 100644
--- a/apps/desktop/cypress/e2e/branches.cy.ts
+++ b/apps/desktop/cypress/e2e/branches.cy.ts
@@ -168,7 +168,7 @@ describe('Branches', () => {
cy.getByTestId('delete-local-branch-confirmation-modal').should('not.exist');
});
- it('should be able to preivew multiple branches', () => {
+ it('should be able to preview multiple branches', () => {
// Should be able to navigate the different branches
for (const branch of mockBackend.branchListings) {
cy.getByTestId('branch-list-card', branch.name).first().should('be.visible').click();
diff --git a/apps/desktop/cypress/e2e/errorHandling.cy.ts b/apps/desktop/cypress/e2e/errorHandling.cy.ts
index 1866c1aa75..8fb95a4fa6 100644
--- a/apps/desktop/cypress/e2e/errorHandling.cy.ts
+++ b/apps/desktop/cypress/e2e/errorHandling.cy.ts
@@ -146,7 +146,7 @@ describe('Error handling - commit actions', () => {
expect(mockBackend.getDiff).to.have.callCount(0);
});
- it('Fully failing to commit with rejection reasons shuold be handled graceful', () => {
+ it('Fully failing to commit with rejection reasons should be handled graceful', () => {
mockCommand('create_commit_from_worktree_changes', () =>
mockBackend.commitFailureWithReasons(null)
);
@@ -208,7 +208,7 @@ describe('Error handling - commit actions', () => {
cy.getByTestId('commit-drawer-description-input').should('contain', newCommitMessageBody);
});
- it('Partially failing to commit with rejection reasons shuold be handled graceful', () => {
+ it('Partially failing to commit with rejection reasons should be handled graceful', () => {
const newCommitId = '29384726398746289374';
mockCommand('create_commit_from_worktree_changes', () =>
mockBackend.commitFailureWithReasons(newCommitId)
diff --git a/apps/desktop/cypress/e2e/selection.cy.ts b/apps/desktop/cypress/e2e/selection.cy.ts
index fcccbc1e17..0045f509e1 100644
--- a/apps/desktop/cypress/e2e/selection.cy.ts
+++ b/apps/desktop/cypress/e2e/selection.cy.ts
@@ -32,7 +32,7 @@ describe('Selection', () => {
cy.getByTestId('branch-header').should('contain', mockBackend.stackId);
const stacks = mockBackend.getStacks();
- // There shuold be three stacks
+ // There should be three stacks
cy.getByTestId('stack').should('have.length', stacks.length);
// Select the second stack
@@ -45,7 +45,7 @@ describe('Selection', () => {
cy.getByTestIdByValue('branch-header', stackName)
.click()
.within(() => {
- // Shouls have the stack url
+ // Should have the stack url
cy.urlMatches(`/${PROJECT_ID}/workspace`);
});
// Check if the file list is updated
@@ -68,7 +68,7 @@ describe('Selection', () => {
const stacks = mockBackend.getStacks();
const stack = stacks[0]!;
- // There shuold be three stacks
+ // There should be three stacks
cy.getByTestId('stack').should('have.length', stacks.length);
// Select the initial commit which should be local only
@@ -92,7 +92,7 @@ describe('Selection', () => {
cy.getByTestId('branch-header').should('contain', mockBackend.stackWithTwoCommits);
const stacks = mockBackend.getStacks();
- // There shuold be three stacks
+ // There should be three stacks
cy.getByTestId('stack').should('have.length', stacks.length);
cy.getByTestIdByValue('stack', mockBackend.stackWithTwoCommits)
@@ -153,7 +153,7 @@ describe('Selection', () => {
cy.getByTestId('branch-header').should('contain', mockBackend.stackWithTwoCommits);
const stacks = mockBackend.getStacks();
- // There shuold be three stacks
+ // There should be three stacks
cy.getByTestId('stack').should('have.length', stacks.length);
cy.getByTestIdByValue('stack', mockBackend.stackWithTwoCommits)
@@ -239,7 +239,7 @@ describe('Selection with upstream changes', () => {
cy.getByTestId('branch-header').should('contain', mockBackend.stackId);
const stacks = mockBackend.getStacks();
- // There shuold be three stacks
+ // There should be three stacks
cy.getByTestId('stack').should('have.length', stacks.length);
// Select the initial commit which should be local only
diff --git a/apps/desktop/cypress/e2e/unifiedDiffView.cy.ts b/apps/desktop/cypress/e2e/unifiedDiffView.cy.ts
index e8a678b6ff..8f8d4261d3 100644
--- a/apps/desktop/cypress/e2e/unifiedDiffView.cy.ts
+++ b/apps/desktop/cypress/e2e/unifiedDiffView.cy.ts
@@ -348,7 +348,7 @@ describe('Unified Diff View with complex hunks', () => {
// Click on start a commit
cy.getByTestId('start-commit-button').first().click();
- // Unstage everything expet the long hunk file
+ // Unstage everything expect the long hunk file
cy.getByTestId('uncommitted-changes-file-list').within(() => {
cy.getByTestId('file-list-item').each((item) => {
const fileName = item.text().trim();
diff --git a/apps/desktop/cypress/e2e/workspace.cy.ts b/apps/desktop/cypress/e2e/workspace.cy.ts
index 557d46f175..592bfdf812 100644
--- a/apps/desktop/cypress/e2e/workspace.cy.ts
+++ b/apps/desktop/cypress/e2e/workspace.cy.ts
@@ -9,7 +9,7 @@ describe('Workspace', () => {
});
it('Should be redirected to the workspace', () => {
- // This is basically jsut a smoke test to check that the workspace is loaded
+ // This is basically just a smoke test to check that the workspace is loaded
cy.visit('/');
// Should be redirected to the workspac
diff --git a/apps/desktop/src/components/BranchHeader.svelte b/apps/desktop/src/components/BranchHeader.svelte
index 9d66e3c40e..4a73c7432e 100644
--- a/apps/desktop/src/components/BranchHeader.svelte
+++ b/apps/desktop/src/components/BranchHeader.svelte
@@ -128,7 +128,7 @@
class="branch-header"
class:selected
class:active
- class:commiting={isCommitting}
+ class:committing={isCommitting}
{onclick}
onkeypress={onclick}
tabindex="0"
diff --git a/apps/desktop/src/components/ChunkyList.svelte b/apps/desktop/src/components/ChunkyList.svelte
index f1c618bdb7..81e5805fa8 100644
--- a/apps/desktop/src/components/ChunkyList.svelte
+++ b/apps/desktop/src/components/ChunkyList.svelte
@@ -5,7 +5,7 @@
diff --git a/apps/desktop/src/components/UnifiedDiffView.svelte b/apps/desktop/src/components/UnifiedDiffView.svelte
index c953f3fdf1..452c3729d1 100644
--- 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 @@
>
- 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
index 527cc4d162..6108453379 100644
--- 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
#[but_api]
#[instrument(err(Debug))]
-pub fn get_uncommited_files(project_id: ProjectId) -> Result> {
+pub fn get_uncommitted_files(project_id: ProjectId) -> Result> {
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
index d0eaa8dc97..67f61c18a5 100644
--- 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-core/src/tree/tests.rs b/crates/but-core/src/tree/tests.rs
index 60efe9bb8f..99ab9b0875 100644
--- a/crates/but-core/src/tree/tests.rs
+++ b/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#"
diff --git a/crates/but-server/src/lib.rs b/crates/but-server/src/lib.rs
index 2ea30c3daa..dfabd19f8c 100644
--- 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-tools/src/workspace.rs b/crates/but-tools/src/workspace.rs
index cc5a3e1758..c44b514660 100644
--- a/crates/but-tools/src/workspace.rs
+++ b/crates/but-tools/src/workspace.rs
@@ -479,15 +479,15 @@ impl Tool for Amend {
fn description(&self) -> String {
"
- Amend an existingg commit on a branch in the workspace.
+ Amend an existing commit on a branch in the workspace.
This tool allows you to amend a specific commit on a branch in the workspace.
You can specify the new commit message, target branch name, commit id, and a list of file paths to include in the amended commit.
Use this tool if:
- - You want to add uncommitted changes to an existingg commit.
- - You want to update the commit message of an existingg commit.
+ - You want to add uncommitted changes to an existing commit.
+ - You want to update the commit message of an existing commit.
".to_string()
}
@@ -688,7 +688,7 @@ pub struct CreateBlankCommitParameters {
- The stack id should refer to an existingg stack in the workspace.
+ The stack id should refer to an existing stack in the workspace.
")]
pub stack_id: String,
@@ -699,7 +699,7 @@ pub struct CreateBlankCommitParameters {
- This should be the ID of an existingf commit in the stack.
+ This should be the ID of an existing commit in the stack.
")]
pub parent_id: String,
@@ -1134,7 +1134,7 @@ pub struct SquashCommitsParameters {
- The stack id should refer to an existingg stack in the workspace.
+ The stack id should refer to an existing stack in the workspace.
")]
pub stack_id: String,
@@ -1159,7 +1159,7 @@ pub struct SquashCommitsParameters {
- This should be the id of an existingg commit in the stack.
+ This should be the id of an existing commit in the stack.
The commit should be present in the stack specified by `stack_id`.
")]
@@ -1295,7 +1295,7 @@ pub struct SplitBranchParameters {
- This should be the name of an existingg branch in the workspace.
+ This should be the name of an existing branch in the workspace.
")]
pub source_branch_name: String,
@@ -1337,7 +1337,7 @@ impl Tool for SplitBranch {
fn description(&self) -> String {
"
- Split off selected files from an existingg branch into a new branch.
+ Split off selected files from an existing branch into a new branch.
diff --git a/crates/but-workspace/tests/workspace/commit_engine/refs_update.rs b/crates/but-workspace/tests/workspace/commit_engine/refs_update.rs
index e34ed2a314..8ca07b5b4d 100644
--- a/crates/but-workspace/tests/workspace/commit_engine/refs_update.rs
+++ b/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
|/
diff --git a/crates/but-workspace/tests/workspace/ref_info/with_workspace_commit/journey/exhaustive_with_squash_merges.rs b/crates/but-workspace/tests/workspace/ref_info/with_workspace_commit/journey/exhaustive_with_squash_merges.rs
index bc11ea9d64..af20a62a82 100644
--- a/crates/but-workspace/tests/workspace/ref_info/with_workspace_commit/journey/exhaustive_with_squash_merges.rs
+++ b/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),
},
),
diff --git a/crates/but-worktrees/src/integrate.rs b/crates/but-worktrees/src/integrate.rs
index 777cc5eef8..12daff9755 100644
--- 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/but/src/legacy/id/mod.rs b/crates/but/src/legacy/id/mod.rs
index c5622c2f71..e8dc5cfe48 100644
--- a/crates/but/src/legacy/id/mod.rs
+++ b/crates/but/src/legacy/id/mod.rs
@@ -135,7 +135,7 @@ pub struct IdMap {
impl IdMap {
/// Initialise CLI IDs for all information in the `RefInfo` structure for `HEAD` via `ctx`.
// TODO: create an API that enforces reuse of `RefInfo` by its users.
- pub fn new(ctx: &Context) -> anyhow::Result {
+ pub fn new(ctx: &mut Context) -> anyhow::Result {
let mut max_zero_count = 1; // Ensure at least two "0" in ID.
let ContextInfo {
branch_names,
diff --git a/crates/gitbutler-branch-actions/src/actions.rs b/crates/gitbutler-branch-actions/src/actions.rs
index 3d354c8bd4..55d0f3b736 100644
--- 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> {
+pub fn get_uncommitted_files(ctx: &Context) -> Result> {
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
index 200127aae9..8b34cd361b 100644
--- 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
index 7981ac08dd..f92d5e891a 100644
--- 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
index c821098103..e604c5b439 100644
--- 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
index 98f0de8b51..de511dfdb1 100644
--- 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
index de313be530..6338d0ee49 100644
--- 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
index 5fda1e6d76..d2ef4f417e 100644
--- 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
index e60952c93d..3786036eb5 100644
--- 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
index b88fd187b2..0e858a81e1 100644
--- 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-branch-actions/tests/fixtures/branch-details-benches.sh b/crates/gitbutler-branch-actions/tests/fixtures/branch-details-benches.sh
index fb47b533a6..92281e961d 100644
--- a/crates/gitbutler-branch-actions/tests/fixtures/branch-details-benches.sh
+++ b/crates/gitbutler-branch-actions/tests/fixtures/branch-details-benches.sh
@@ -3511,8 +3511,8 @@ git init big-repo
100644 $empty_oid app/assets/javascripts/notes/components/note_form.vue
100644 $empty_oid app/assets/javascripts/notes/components/note_header.vue
100644 $empty_oid app/assets/javascripts/notes/components/note_signed_out_widget.vue
-100644 $empty_oid app/assets/javascripts/notes/components/notable_discussion.vue
-100644 $empty_oid app/assets/javascripts/notes/components/notable_note.vue
+100644 $empty_oid app/assets/javascripts/notes/components/noteable_discussion.vue
+100644 $empty_oid app/assets/javascripts/notes/components/noteable_note.vue
100644 $empty_oid app/assets/javascripts/notes/components/notes_activity_header.vue
100644 $empty_oid app/assets/javascripts/notes/components/notes_app.vue
100644 $empty_oid app/assets/javascripts/notes/components/sidebar_subscription.vue
@@ -3527,7 +3527,7 @@ git init big-repo
100644 $empty_oid app/assets/javascripts/notes/mixins/diff_line_note_form.js
100644 $empty_oid app/assets/javascripts/notes/mixins/discussion_navigation.js
100644 $empty_oid app/assets/javascripts/notes/mixins/issuable_state.js
-100644 $empty_oid app/assets/javascripts/notes/mixins/notable.js
+100644 $empty_oid app/assets/javascripts/notes/mixins/noteable.js
100644 $empty_oid app/assets/javascripts/notes/mixins/resolvable.js
100644 $empty_oid app/assets/javascripts/notes/stores/actions.js
100644 $empty_oid app/assets/javascripts/notes/stores/collapse_utils.js
@@ -5545,7 +5545,7 @@ git init big-repo
100644 $empty_oid app/assets/javascripts/vue_shared/components/new_resource_dropdown/graphql/search_user_projects_with_merge_requests_enabled.query.graphql
100644 $empty_oid app/assets/javascripts/vue_shared/components/new_resource_dropdown/init_new_resource_dropdown.js
100644 $empty_oid app/assets/javascripts/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue
-100644 $empty_oid app/assets/javascripts/vue_shared/components/notes/notable_warning.vue
+100644 $empty_oid app/assets/javascripts/vue_shared/components/notes/noteable_warning.vue
100644 $empty_oid app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
100644 $empty_oid app/assets/javascripts/vue_shared/components/notes/placeholder_system_note.vue
100644 $empty_oid app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue
@@ -6143,7 +6143,7 @@ git init big-repo
100644 $empty_oid app/channels/application_cable/connection.rb
100644 $empty_oid app/channels/application_cable/logging.rb
100644 $empty_oid app/channels/graphql_channel.rb
-100644 $empty_oid app/channels/notable/notes_channel.rb
+100644 $empty_oid app/channels/noteable/notes_channel.rb
100644 $empty_oid app/components/diffs/base_component.rb
100644 $empty_oid app/components/diffs/overflow_warning_component.html.haml
100644 $empty_oid app/components/diffs/overflow_warning_component.rb
@@ -7400,7 +7400,7 @@ git init big-repo
100644 $empty_oid app/graphql/resolvers/namespaces/work_item_state_counts_resolver.rb
100644 $empty_oid app/graphql/resolvers/namespaces/work_items_resolver.rb
100644 $empty_oid app/graphql/resolvers/nested_groups_resolver.rb
-100644 $empty_oid app/graphql/resolvers/notable/notes_resolver.rb
+100644 $empty_oid app/graphql/resolvers/noteable/notes_resolver.rb
100644 $empty_oid app/graphql/resolvers/notes/synthetic_note_resolver.rb
100644 $empty_oid app/graphql/resolvers/organizations/groups_resolver.rb
100644 $empty_oid app/graphql/resolvers/organizations/organization_resolver.rb
@@ -7819,7 +7819,7 @@ git init big-repo
100644 $empty_oid app/graphql/types/namespace_type.rb
100644 $empty_oid app/graphql/types/negated_milestone_wildcard_id_enum.rb
100644 $empty_oid app/graphql/types/nested_environment_type.rb
-100644 $empty_oid app/graphql/types/notable_type.rb
+100644 $empty_oid app/graphql/types/noteable_type.rb
100644 $empty_oid app/graphql/types/notes/deleted_note_type.rb
100644 $empty_oid app/graphql/types/notes/diff_image_position_input_type.rb
100644 $empty_oid app/graphql/types/notes/diff_position_base_input_type.rb
@@ -7827,7 +7827,7 @@ git init big-repo
100644 $empty_oid app/graphql/types/notes/diff_position_type.rb
100644 $empty_oid app/graphql/types/notes/discussion_type.rb
100644 $empty_oid app/graphql/types/notes/note_type.rb
-100644 $empty_oid app/graphql/types/notes/notable_interface.rb
+100644 $empty_oid app/graphql/types/notes/noteable_interface.rb
100644 $empty_oid app/graphql/types/notes/position_type_enum.rb
100644 $empty_oid app/graphql/types/notes/system_note_metadata_type.rb
100644 $empty_oid app/graphql/types/notes/update_diff_image_position_input_type.rb
@@ -8690,7 +8690,7 @@ git init big-repo
100644 $empty_oid app/models/concerns/milestoneish.rb
100644 $empty_oid app/models/concerns/mirror_authentication.rb
100644 $empty_oid app/models/concerns/note_on_diff.rb
-100644 $empty_oid app/models/concerns/notable.rb
+100644 $empty_oid app/models/concerns/noteable.rb
100644 $empty_oid app/models/concerns/notes/active_record.rb
100644 $empty_oid app/models/concerns/notes/discussion.rb
100644 $empty_oid app/models/concerns/notification_branch_selection.rb
@@ -9868,7 +9868,7 @@ git init big-repo
100644 $empty_oid app/serializers/merge_request_for_pipeline_entity.rb
100644 $empty_oid app/serializers/merge_request_metrics_entity.rb
100644 $empty_oid app/serializers/merge_request_metrics_helper.rb
-100644 $empty_oid app/serializers/merge_request_notable_entity.rb
+100644 $empty_oid app/serializers/merge_request_noteable_entity.rb
100644 $empty_oid app/serializers/merge_request_poll_cached_widget_entity.rb
100644 $empty_oid app/serializers/merge_request_poll_widget_entity.rb
100644 $empty_oid app/serializers/merge_request_serializer.rb
diff --git a/crates/gitbutler-edit-mode/src/lib.rs b/crates/gitbutler-edit-mode/src/lib.rs
index 0487ffddc2..3dfc77cea4 100644
--- 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
index 98b3af5164..99d3edbcc6 100644
--- 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
index f0a44bc8e6..9e5483a46f 100644
--- 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) {
diff --git a/packages/ui/src/lib/components/file/typeMap.ts b/packages/ui/src/lib/components/file/typeMap.ts
index deaa17d2e9..d8444a5e9c 100644
--- a/packages/ui/src/lib/components/file/typeMap.ts
+++ b/packages/ui/src/lib/components/file/typeMap.ts
@@ -661,7 +661,7 @@ export const symbolFileNamesToIcons: { [key: string]: string } = {
'sanity.cli.ts': 'sanity',
'sanity.config.ts': 'sanity',
'sanity.theme.mjs': 'sanity',
- 'serverless.yml': 'severless',
+ 'serverless.yml': 'serverless',
'setup.cfg': 'python',
'stylelint.config.cjs': 'stylelint',
'stylelint.config.js': 'stylelint',