Improve order integrity

Author: Caleb-T-Owens

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

@@ -5,6 +5,7 @@ use std::{
 
 use crate::{error::Code, fs::read_toml_file_or_default};
 use anyhow::{anyhow, Result};
+use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 
 use super::{target::Target, Branch};
@@ -126,6 +127,38 @@ impl VirtualBranchesHandle {
     fn write_file(&self, virtual_branches: &VirtualBranches) -> Result<()> {
         write(self.file_path.as_path(), virtual_branches)
     }
+
+    pub fn update_ordering(&self) -> Result<()> {
+        let succeeded = self
+            .list_branches()?
+            .iter()
+            .sorted_by_key(|branch| branch.order)
+            .enumerate()
+            .all(|(index, branch)| {
+                let mut branch = branch.clone();
+                branch.order = index;
+                self.set_branch(branch).is_ok()
+            });
+
+        if succeeded {
+            Ok(())
+        } else {
+            Err(anyhow!("Failed to update virtual branches ordering"))
+        }
+    }
+
+    pub fn next_order_index(&self) -> Result<usize> {
+        self.update_ordering()?;
+        let order = self
+            .list_branches()?
+            .iter()
+            .sorted_by_key(|branch| branch.order)
+            .collect::<Vec<&Branch>>()
+            .last()
+            .map_or(0, |b| b.order + 1);
+
+        Ok(order)
+    }
 }
 
 fn write<P: AsRef<Path>>(file_path: P, virtual_branches: &VirtualBranches) -> Result<()> {

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

@@ -476,6 +476,8 @@ pub fn convert_to_real_branch(
         conflicts::clear(project_repository)?;
     }
 
+    vb_state.update_ordering()?;
+
     // Ensure we still have a default target
     ensure_selected_for_changes(&vb_state).context("failed to ensure selected for changes")?;
 
@@ -810,10 +812,7 @@ pub fn create_virtual_branch(
 
     all_virtual_branches.sort_by_key(|branch| branch.order);
 
-    let order = create
-        .order
-        .unwrap_or(all_virtual_branches.len())
-        .clamp(0, all_virtual_branches.len());
+    let order = create.order.unwrap_or(vb_state.next_order_index()?);
 
     let selected_for_changes = if let Some(selected_for_changes) = create.selected_for_changes {
         if selected_for_changes {
@@ -3581,7 +3580,7 @@ pub fn create_virtual_branch_from_branch(
         .into_iter()
         .collect::<Vec<branch::Branch>>();
 
-    let order = all_virtual_branches.len();
+    let order = vb_state.next_order_index()?;
 
     let selected_for_changes = (!all_virtual_branches
         .iter()