Add integrate-upstream subcommand

Author: Byron

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

@@ -41,9 +41,9 @@ pub enum BaseBranchResolutionApproach {
     HardReset,
 }
 
-#[derive(Serialize, Deserialize, PartialEq, Debug)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq)]
 #[serde(tag = "type", content = "subject", rename_all = "camelCase")]
-enum ResolutionApproach {
+pub enum ResolutionApproach {
     Rebase,
     Merge,
     Unapply,
@@ -75,11 +75,11 @@ impl BranchStatus {
 #[derive(Serialize, Deserialize, PartialEq, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct Resolution {
-    branch_id: StackId,
+    pub branch_id: StackId,
     /// Used to ensure a given branch hasn't changed since the UI issued the command.
     #[serde(with = "gitbutler_serde::oid")]
-    branch_tree: git2::Oid,
-    approach: ResolutionApproach,
+    pub branch_tree: git2::Oid,
+    pub approach: ResolutionApproach,
 }
 
 enum IntegrationResult {

crates/gitbutler-cli/src/args.rs

@@ -14,6 +14,14 @@ pub struct Args {
     pub cmd: Subcommands,
 }
 
+#[derive(Debug, Clone, clap::ValueEnum)]
+pub enum UpdateMode {
+    Rebase,
+    Merge,
+    Unapply,
+    Delete,
+}
+
 #[derive(Debug, clap::Subcommand)]
 pub enum Subcommands {
     /// Unapply the given ownership claim.
@@ -25,6 +33,12 @@ pub enum Subcommands {
         /// The last line of hunks that should be removed.
         to_line: u32,
     },
+    /// Update the local workspace against an updated remote or target branch.
+    IntegrateUpstream {
+        /// Specify how all branches should be merged in.
+        #[clap(value_enum)]
+        mode: UpdateMode,
+    },
     /// List and manipulate virtual branches.
     #[clap(visible_alias = "branches")]
     Branch(vbranch::Platform),

crates/gitbutler-cli/src/command/mod.rs

@@ -60,3 +60,28 @@ pub mod ownership {
         gitbutler_branch_actions::unapply_ownership(&project, &claims)
     }
 }
+
+pub mod workspace {
+    use crate::args::UpdateMode;
+    use gitbutler_branch_actions::upstream_integration;
+    use gitbutler_project::Project;
+
+    pub fn update(project: Project, mode: UpdateMode) -> anyhow::Result<()> {
+        let approach = match mode {
+            UpdateMode::Rebase => upstream_integration::ResolutionApproach::Rebase,
+            UpdateMode::Merge => upstream_integration::ResolutionApproach::Merge,
+            UpdateMode::Unapply => upstream_integration::ResolutionApproach::Unapply,
+            UpdateMode::Delete => upstream_integration::ResolutionApproach::Delete,
+        };
+        let resolutions: Vec<_> = gitbutler_branch_actions::list_virtual_branches(&project)?
+            .0
+            .into_iter()
+            .map(|b| upstream_integration::Resolution {
+                branch_id: b.id,
+                branch_tree: b.tree,
+                approach,
+            })
+            .collect();
+        gitbutler_branch_actions::integrate_upstream(&project, &resolutions, None)
+    }
+}

crates/gitbutler-cli/src/main.rs

@@ -17,6 +17,10 @@ fn main() -> Result<()> {
     let _op_span = tracing::info_span!("cli-op").entered();
 
     match args.cmd {
+        args::Subcommands::IntegrateUpstream { mode } => {
+            let project = command::prepare::project_from_path(args.current_dir)?;
+            command::workspace::update(project, mode)
+        }
         args::Subcommands::UnapplyOwnership {
             filepath,
             from_line,