Remove ideas about being unapplied

Author: Caleb-T-Owens

crates/gitbutler-core/src/ops/oplog.rs

@@ -80,9 +80,7 @@ impl Project {
         let mut head_tree_ids = Vec::new();
 
         for branch in vb_state.list_branches()? {
-            if branch.applied {
-                head_tree_ids.push(branch.tree);
-            }
+            head_tree_ids.push(branch.tree);
 
             // commits in virtual branches (tree and commit data)
             // calculate all the commits between branch.head and the target and codify them
@@ -685,10 +683,7 @@ fn lines_since_snapshot(project: &Project, repo: &git2::Repository) -> Result<us
 
     let vbranches = project.virtual_branches().list_branches()?;
     let mut lines_changed = 0;
-    let dirty_branches = vbranches
-        .iter()
-        .filter(|b| b.applied)
-        .filter(|b| !b.ownership.claims.is_empty());
+    let dirty_branches = vbranches.iter().filter(|b| !b.ownership.claims.is_empty());
     for branch in dirty_branches {
         lines_changed += branch_lines_since_snapshot(branch, repo, oplog_commit_id)?;
     }
@@ -782,12 +777,8 @@ fn tree_from_applied_vbranches(
 
     let vbs_from_toml: crate::virtual_branches::VirtualBranchesState =
         toml::from_str(from_utf8(vb_toml_blob.content())?)?;
-    let applied_branch_trees: Vec<git2::Oid> = vbs_from_toml
-        .branches
-        .values()
-        .filter(|b| b.applied)
-        .map(|b| b.tree)
-        .collect();
+    let applied_branch_trees: Vec<git2::Oid> =
+        vbs_from_toml.branches.values().map(|b| b.tree).collect();
 
     let mut workdir_tree_id = target_tree.id();
     let base_tree = target_tree;

crates/gitbutler-core/src/virtual_branches/base.rs

@@ -11,9 +11,7 @@ use super::{
     },
     target, BranchId, RemoteCommit, VirtualBranchHunk, VirtualBranchesHandle,
 };
-use crate::{
-    git::BranchExt, git::RepositoryExt, types::ReferenceName, virtual_branches::errors::Marker,
-};
+use crate::{git::RepositoryExt, virtual_branches::errors::Marker};
 use crate::{
     git::{self, diff},
     project_repository::{self, LogUntil},
@@ -69,11 +67,6 @@ fn go_back_to_integration(
         .list_branches()
         .context("failed to read virtual branches")?;
 
-    let applied_virtual_branches = all_virtual_branches
-        .iter()
-        .filter(|branch| branch.applied)
-        .collect::<Vec<_>>();
-
     let target_commit = project_repository
         .repo()
         .find_commit(default_target.sha)
@@ -85,7 +78,7 @@ fn go_back_to_integration(
     let mut final_tree = target_commit
         .tree()
         .context("failed to get base tree from commit")?;
-    for branch in &applied_virtual_branches {
+    for branch in &all_virtual_branches {
         // merge this branches tree with our tree
         let branch_head = project_repository
             .repo()
@@ -243,7 +236,7 @@ pub fn set_base_branch(
                 id: BranchId::generate(),
                 name: head_name.to_string().replace("refs/heads/", ""),
                 notes: String::new(),
-                applied: true,
+                old_applied: true,
                 upstream,
                 upstream_head,
                 created_timestamp_ms: now_ms,
@@ -547,7 +540,6 @@ pub fn update_base_branch<'repo>(
 
     let final_tree = updated_vbranches
         .iter()
-        .filter(|branch| branch.applied)
         .fold(new_target_commit.tree(), |final_tree, branch| {
             let repo: &git2::Repository = repo;
             let final_tree = final_tree?;

crates/gitbutler-core/src/virtual_branches/branch/mod.rs

@@ -21,7 +21,9 @@ pub struct Branch {
     pub id: BranchId,
     pub name: String,
     pub notes: String,
-    pub applied: bool,
+    /// Previously used to determine if the branch should be shown on the board. If a branch is not shown on the board, it is converted to a real git branch.
+    #[serde(rename = "applied")]
+    pub old_applied: bool,
     pub upstream: Option<git::RemoteRefname>,
     // upstream_head is the last commit on we've pushed to the upstream branch
     #[serde(with = "crate::serde::oid_opt", default)]

crates/gitbutler-core/src/virtual_branches/branch/ownership.rs

@@ -134,7 +134,6 @@ pub fn reconcile_claims(
 ) -> Result<Vec<ClaimOutcome>> {
     let mut other_branches = all_branches
         .into_iter()
-        .filter(|branch| branch.applied)
         .filter(|branch| branch.id != claiming_branch.id)
         .collect::<Vec<_>>();
 

crates/gitbutler-core/src/virtual_branches/integration.rs

@@ -44,23 +44,20 @@ pub fn get_workspace_head(
     let vb_state = project_repo.project().virtual_branches();
 
     let all_virtual_branches = vb_state.list_branches()?;
-    let applied_branches = all_virtual_branches
-        .iter()
-        .filter(|branch| branch.applied)
-        .collect::<Vec<_>>();
+    let branches = all_virtual_branches.iter().collect::<Vec<_>>();
 
     let target_commit = repo.find_commit(target.sha)?;
     let mut workspace_tree = target_commit.tree()?;
 
     if conflicts::is_conflicting(project_repo, None)? {
         let merge_parent =
             conflicts::merge_parent(project_repo)?.ok_or(anyhow!("No merge parent"))?;
-        let first_branch = applied_branches.first().ok_or(anyhow!("No branches"))?;
+        let first_branch = branches.first().ok_or(anyhow!("No branches"))?;
 
         let merge_base = repo.merge_base(first_branch.head, merge_parent)?;
         workspace_tree = repo.find_commit(merge_base)?.tree()?;
     } else {
-        for branch in &applied_branches {
+        for branch in &branches {
             let branch_tree = repo.find_commit(branch.head)?.tree()?;
             let merge_tree = repo.find_commit(target.sha)?.tree()?;
             let mut index = repo.merge_trees(&merge_tree, &workspace_tree, &branch_tree, None)?;
@@ -73,7 +70,7 @@ pub fn get_workspace_head(
         }
     }
 
-    let branch_heads = applied_branches
+    let branch_heads = branches
         .iter()
         .map(|b| repo.find_commit(b.head))
         .collect::<Result<Vec<_>, _>>()?;
@@ -87,7 +84,7 @@ pub fn get_workspace_head(
     // TODO(mg): Can we make this a constant?
     let committer = get_integration_commiter()?;
 
-    let mut heads: Vec<git2::Commit<'_>> = applied_branches
+    let mut heads: Vec<git2::Commit<'_>> = branches
         .iter()
         .filter(|b| b.head != target.sha)
         .map(|b| repo.find_commit(b.head))
@@ -177,11 +174,6 @@ pub fn update_gitbutler_integration(
         .list_branches()
         .context("failed to list virtual branches")?;
 
-    let applied_virtual_branches = all_virtual_branches
-        .iter()
-        .filter(|branch| branch.applied)
-        .collect::<Vec<_>>();
-
     let integration_commit =
         repo.find_commit(get_workspace_head(&vb_state, project_repository)?)?;
     let integration_tree = integration_commit.tree()?;
@@ -200,7 +192,7 @@ pub fn update_gitbutler_integration(
     message.push_str("If you switch to another branch, GitButler will need to be reinitialized.\n");
     message.push_str("If you commit on this branch, GitButler will throw it away.\n\n");
     message.push_str("Here are the branches that are currently applied:\n");
-    for branch in &applied_virtual_branches {
+    for branch in &all_virtual_branches {
         message.push_str(" - ");
         message.push_str(branch.name.as_str());
         message.push_str(format!(" ({})", &branch.refname()).as_str());