Merge pull request #5270 from gitbutlerapp/kv-branch-1

Remove stack extention trait - now it can be an impl block

crates/gitbutler-branch-actions/src/base.rs

@@ -8,7 +8,6 @@ use gitbutler_project::FetchResult;
 use gitbutler_reference::{Refname, RemoteRefname};
 use gitbutler_repo::{LogUntil, RepositoryExt};
 use gitbutler_repo_actions::RepoActionsExt;
-use gitbutler_stack::StackExt;
 use gitbutler_stack::{BranchOwnershipClaims, Stack, Target, VirtualBranchesHandle};
 use serde::Serialize;
 

crates/gitbutler-branch-actions/src/branch_manager/branch_creation.rs

@@ -13,7 +13,6 @@ use gitbutler_repo::{
     LogUntil, RepositoryExt,
 };
 use gitbutler_repo_actions::RepoActionsExt;
-use gitbutler_stack::StackExt;
 use gitbutler_stack::{BranchOwnershipClaims, Stack, StackId};
 use gitbutler_time::time::now_since_unix_epoch_ms;
 use tracing::instrument;

crates/gitbutler-branch-actions/src/branch_upstream_integration.rs

@@ -5,8 +5,8 @@ use gitbutler_repo::{
     rebase::{cherry_rebase_group, gitbutler_merge_commits},
     LogUntil, RepositoryExt as _,
 };
+use gitbutler_stack::commit_by_oid_or_change_id;
 use gitbutler_stack::StackId;
-use gitbutler_stack::{commit_by_oid_or_change_id, StackExt};
 
 use crate::{
     branch_trees::{

crates/gitbutler-branch-actions/src/integration.rs

@@ -12,7 +12,6 @@ use gitbutler_operating_modes::OPEN_WORKSPACE_REFS;
 use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_repo::SignaturePurpose;
 use gitbutler_repo::{LogUntil, RepositoryExt};
-use gitbutler_stack::StackExt;
 use gitbutler_stack::{Stack, VirtualBranchesHandle};
 use tracing::instrument;
 

crates/gitbutler-branch-actions/src/move_commits.rs

@@ -7,7 +7,6 @@ use gitbutler_command_context::CommandContext;
 use gitbutler_commit::commit_ext::CommitExt;
 use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_repo::{rebase::cherry_rebase_group, LogUntil, RepositoryExt};
-use gitbutler_stack::StackExt;
 use gitbutler_stack::{OwnershipClaim, StackId};
 use std::collections::HashMap;
 

crates/gitbutler-branch-actions/src/reorder_commits.rs

@@ -2,7 +2,6 @@ use anyhow::{bail, Context as _, Result};
 use gitbutler_command_context::CommandContext;
 use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_repo::{rebase::cherry_rebase_group, LogUntil, RepositoryExt as _};
-use gitbutler_stack::StackExt;
 use gitbutler_stack::StackId;
 
 use crate::{

crates/gitbutler-branch-actions/src/stack.rs

@@ -7,7 +7,7 @@ use gitbutler_commit::commit_ext::CommitExt;
 use gitbutler_patch_reference::{CommitOrChangeId, PatchReference};
 use gitbutler_project::Project;
 use gitbutler_repo_actions::RepoActionsExt;
-use gitbutler_stack::{commit_by_oid_or_change_id, CommitsForId, PatchReferenceUpdate, StackExt};
+use gitbutler_stack::{commit_by_oid_or_change_id, CommitsForId, PatchReferenceUpdate};
 use gitbutler_stack::{Stack, StackId, Target};
 use serde::{Deserialize, Serialize};
 

crates/gitbutler-branch-actions/src/status.rs

@@ -15,7 +15,6 @@ use gitbutler_command_context::CommandContext;
 use gitbutler_diff::{diff_files_into_hunks, GitHunk, Hunk, HunkHash};
 use gitbutler_operating_modes::assure_open_workspace_mode;
 use gitbutler_project::access::WorktreeWritePermission;
-use gitbutler_stack::StackExt;
 use gitbutler_stack::{BranchOwnershipClaims, OwnershipClaim, Stack, StackId};
 use tracing::instrument;
 

crates/gitbutler-branch-actions/src/undo_commit.rs

@@ -2,7 +2,6 @@ use anyhow::{bail, Context as _, Result};
 use gitbutler_command_context::CommandContext;
 use gitbutler_commit::commit_ext::CommitExt as _;
 use gitbutler_repo::{rebase::cherry_rebase_group, LogUntil, RepositoryExt as _};
-use gitbutler_stack::StackExt;
 use gitbutler_stack::{Stack, StackId};
 
 use crate::VirtualBranchesExt as _;

crates/gitbutler-branch-actions/src/upstream_integration.rs

@@ -7,7 +7,6 @@ use gitbutler_repo::{
     LogUntil, RepositoryExt as _,
 };
 use gitbutler_repo_actions::RepoActionsExt as _;
-use gitbutler_stack::StackExt;
 use gitbutler_stack::{Stack, StackId, Target, VirtualBranchesHandle};
 use serde::{Deserialize, Serialize};
 

crates/gitbutler-branch-actions/src/virtual.rs

@@ -28,7 +28,6 @@ use gitbutler_repo::{
     LogUntil, RepositoryExt,
 };
 use gitbutler_repo_actions::RepoActionsExt;
-use gitbutler_stack::StackExt;
 use gitbutler_stack::{
     reconcile_claims, BranchOwnershipClaims, Stack, StackId, Target, VirtualBranchesHandle,
 };

crates/gitbutler-branch-actions/tests/extra/mod.rs

@@ -20,7 +20,6 @@ use gitbutler_branch_actions::{
 use gitbutler_commit::{commit_ext::CommitExt, commit_headers::CommitHeadersV2};
 use gitbutler_reference::{Refname, RemoteRefname};
 use gitbutler_repo::RepositoryExt;
-use gitbutler_stack::StackExt;
 use gitbutler_stack::{BranchOwnershipClaims, Target, VirtualBranchesHandle};
 use gitbutler_testsupport::{commit_all, virtual_branches::set_test_target, Case, Suite};
 use pretty_assertions::assert_eq;

crates/gitbutler-edit-mode/src/lib.rs

@@ -25,7 +25,6 @@ use gitbutler_project::access::{WorktreeReadPermission, WorktreeWritePermission}
 use gitbutler_reference::{ReferenceName, Refname};
 use gitbutler_repo::{rebase::cherry_rebase, RepositoryExt};
 use gitbutler_repo::{signature, SignaturePurpose};
-use gitbutler_stack::StackExt;
 use gitbutler_stack::{Stack, VirtualBranchesHandle};
 use serde::Serialize;
 

crates/gitbutler-stack/src/lib.rs

@@ -12,8 +12,5 @@ pub use target::Target;
 
 mod heads;
 mod series;
-mod stack_ext;
 pub use series::Series;
-pub use stack_ext::{
-    commit_by_oid_or_change_id, CommitsForId, PatchReferenceUpdate, StackExt, TargetUpdate,
-};
+pub use stack::{commit_by_oid_or_change_id, CommitsForId, PatchReferenceUpdate, TargetUpdate};