c6a60fd remote-helper: Add 'patch.destination' — heartwood

Radicle Heartwood Protocol & Stack

remote-helper: Add 'patch.destination'

Adrian Duke committed 7 days ago

commit c6a60fdc45dbe5375e7bcf9afdc592d387d7b427
parent f0242b30a44c87802a2b6f64d4fbca23b84180b8

2 files changed +28 -5

modified crates/radicle-remote-helper/src/main.rs

@@ -207,6 +207,8 @@ struct Options {

     message: cli::patch::Message,
     /// Create a branch and set its upstream when opening a patch.
     branch: Branch,
     /// Patch destination branch to use, when opening or updating a patch.
     destination: Option<git::fmt::RefString>,
     verbosity: Verbosity,
 }

@@ -439,6 +441,9 @@ fn push_option(args: &[&str], opts: &mut Options) -> Result<(), Error> {

                 "patch.branch" => {
                     opts.branch = Branch::Provided(git::fmt::RefString::try_from(val)?)
                 }
                 "patch.destination" => {
                     opts.destination = Some(git::fmt::RefString::try_from(val)?);
                 }
                 other => {
                     return Err(Error::UnsupportedPushOption(other.to_owned()));
                 }

modified crates/radicle-remote-helper/src/push.rs

@@ -583,7 +583,7 @@ where

             title,
             &description,
             patch::MergeTarget::default(),
             None, // TODO(Ade): Implement
             opts.destination.clone(),
             base,
             *head,
             &[],

@@ -593,7 +593,7 @@ where

             title,
             &description,
             patch::MergeTarget::default(),
             None, // TODO(Ade): Implement
             opts.destination.clone(),
             base,
             *head,
             &[],

@@ -761,7 +761,15 @@ where

     // and pushed, but the patch hasn't yet been updated. On push to the patch branch,
     // it'll seem like the patch is "empty", because the changes are already in the base branch.
     if base == *head && patch_mut.is_open() {
         patch_merge(patch_mut, revision.id(), *head, working, signer)?;
         let destination = patch_mut.destination().cloned();
         patch_merge(
             patch_mut,
             revision.id(),
             *head,
             destination,
             working,
             signer,
         )?;
     } else {
         eprintln!(
             "To compare against your previous revision {}, run:\n\n   {}\n",

@@ -837,6 +845,7 @@ where

 fn patch_revert_all<Signer>(
     old: git::Oid,
     new: git::Oid,
     destination: Option<git::fmt::RefString>,
     stored: &git::raw::Repository,
     patches: &mut patch::Cache<
         '_,

@@ -904,6 +913,7 @@ where

 fn patch_merge_all<Signer>(
     old: git::Oid,
     new: git::Oid,
     destination: Option<git::fmt::RefString>,
     working: &git::raw::Repository,
     patches: &mut patch::Cache<
         '_,

@@ -950,7 +960,14 @@ where

         for commit in &commits {
             if let Some((revision_id, head)) = revisions.iter().find(|(_, head)| commit == head) {
                 let patch = patch::PatchMut::new(id, patch, patches);
                 patch_merge(patch, *revision_id, *head, working, signer)?;
                 patch_merge(
                     patch,
                     *revision_id,
                     *head,
                     destination.clone(),
                     working,
                     signer,
                 )?;
                 break;
             }

@@ -963,6 +980,7 @@ fn patch_merge<Signer, C>(

     mut patch: patch::PatchMut<'_, '_, '_, storage::git::Repository, Signer, C>,
     revision: patch::RevisionId,
     commit: git::Oid,
     destination: Option<git::fmt::RefString>,
     working: &git::raw::Repository,
     signer: &Signer,
 ) -> Result<(), Error>

@@ -974,7 +992,7 @@ where

     C: cob::cache::Update<patch::Patch>,
 {
     let (latest, _) = patch.latest();
     let merged = patch.merge(revision, commit, None)?; // TODO(Ade): Implement
     let merged = patch.merge(revision, commit, destination)?;
     if revision == latest {
         eprintln!(