feat(submit): support multiple revset arguments

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - This allows `git sync my-branch` to work as expected, instead of needing to use `git sync 'stack(my-branch)'`. The behavior of `git sync` when called without arguments is not affected by this change. If you rely on the previous behavior, please use `git move -x <commit(s)/revset> -d 'main()'` instead.
 - (#1169) `git record` now accepts multible `--message` arguments.
 - (#1130) `branches()` revset function now accepts an optional text pattern argument to limit which branches are matched.
+- (#1244) `git submit` now accepts multiple argements/revsets
 
 ### Fixed
 

git-branchless-opts/src/lib.rs

@@ -387,7 +387,7 @@ pub struct SubmitArgs {
     /// The commits to push. All branches attached to those commits will be
     /// pushed.
     #[clap(value_parser, default_value = "stack()")]
-    pub revset: Revset,
+    pub revsets: Vec<Revset>,
 
     /// Options for resolving revset expressions.
     #[clap(flatten)]

git-branchless-submit/src/lib.rs

@@ -24,7 +24,7 @@ use git_branchless_test::{RawTestOptions, ResolvedTestOptions, Verbosity};
 use github::GithubForge;
 use itertools::Itertools;
 use lazy_static::lazy_static;
-use lib::core::dag::{CommitSet, Dag};
+use lib::core::dag::{union_all, CommitSet, Dag};
 use lib::core::effects::Effects;
 use lib::core::eventlog::{EventLogDb, EventReplayer};
 use lib::core::formatting::{Pluralize, StyledStringBuilder};
@@ -188,7 +188,7 @@ pub fn command_main(ctx: CommandContext, args: SubmitArgs) -> EyreExitOr<()> {
         create,
         draft,
         strategy,
-        revset,
+        revsets,
         resolve_revset_options,
         forge,
         message,
@@ -197,7 +197,7 @@ pub fn command_main(ctx: CommandContext, args: SubmitArgs) -> EyreExitOr<()> {
     submit(
         &effects,
         &git_run_info,
-        revset,
+        revsets,
         &resolve_revset_options,
         create,
         draft,
@@ -211,7 +211,7 @@ pub fn command_main(ctx: CommandContext, args: SubmitArgs) -> EyreExitOr<()> {
 fn submit(
     effects: &Effects,
     git_run_info: &GitRunInfo,
-    revset: Revset,
+    revsets: Vec<Revset>,
     resolve_revset_options: &ResolveRevsetOptions,
     create: bool,
     draft: bool,
@@ -234,19 +234,14 @@ fn submit(
         &references_snapshot,
     )?;
 
-    let commit_set = match resolve_commits(
-        effects,
-        &repo,
-        &mut dag,
-        &[revset.clone()],
-        resolve_revset_options,
-    ) {
-        Ok(mut commit_sets) => commit_sets.pop().unwrap(),
-        Err(err) => {
-            err.describe(effects)?;
-            return Ok(Err(ExitCode(1)));
-        }
-    };
+    let commit_set =
+        match resolve_commits(effects, &repo, &mut dag, &revsets, resolve_revset_options) {
+            Ok(commit_sets) => union_all(&commit_sets),
+            Err(err) => {
+                err.describe(effects)?;
+                return Ok(Err(ExitCode(1)));
+            }
+        };
 
     let raw_test_options = RawTestOptions {
         exec: Some("<dummy>".to_string()),
@@ -294,14 +289,15 @@ fn submit(
         message,
     };
 
+    let unioned_revset = Revset(revsets.iter().map(|Revset(inner)| inner).join(" + "));
     let mut forge = select_forge(
         effects,
         git_run_info,
         &repo,
         &mut dag,
         &event_log_db,
         &references_snapshot,
-        &revset,
+        &unioned_revset,
         forge_kind,
     );
     let statuses = try_exit_code!(forge.query_status(commit_set)?);

git-branchless-submit/tests/test_submit.rs

@@ -64,6 +64,28 @@ fn test_submit() -> eyre::Result<()> {
         "###);
     }
 
+    // test handling of revset argument (should be identical to above)
+    {
+        let (stdout, stderr) = cloned_repo.run(&["submit", "bar+qux"])?;
+        insta::assert_snapshot!(stderr, @"");
+        insta::assert_snapshot!(stdout, @r###"
+        Skipped 2 commits (not yet on remote): bar, qux
+        These commits were skipped because they were not already associated with a remote
+        repository. To submit them, retry this operation with the --create option.
+        "###);
+    }
+
+    // test handling of multiple revset arguments (should be identical to above)
+    {
+        let (stdout, stderr) = cloned_repo.run(&["submit", "bar", "qux"])?;
+        insta::assert_snapshot!(stderr, @"");
+        insta::assert_snapshot!(stdout, @r###"
+        Skipped 2 commits (not yet on remote): bar, qux
+        These commits were skipped because they were not already associated with a remote
+        repository. To submit them, retry this operation with the --create option.
+        "###);
+    }
+
     {
         let (stdout, stderr) = cloned_repo.run(&["submit", "--dry-run"])?;
         insta::assert_snapshot!(stderr, @"");