replay: use standard revision ranges

Instead of the fixed "<oldbase> <branch>" arguments, the replay
command now accepts "<revision-range>..." arguments in a similar
way as many other Git commands. This makes its interface more
standard and more flexible.

This also enables many revision related options accepted and
eaten by setup_revisions(). If the replay command was a high level
one or had a high level mode, it would make sense to restrict some
of the possible options, like those generating non-contiguous
history, as they could be confusing for most users.

Also as the interface of the command is now mostly finalized,
we can add more documentation and more testcases to make sure
the command will continue to work as designed in the future.

We only document the rev-list related options among all the
revision related options that are now accepted, as the rev-list
related ones are probably the most useful for now.

Helped-by: Dragan Simic <dsimic@manjaro.org>
Helped-by: Linus Arver <linusa@google.com>
Co-authored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-replay.txt b/Documentation/git-replay.txt
index 267282d92a6cc449cf9a68f1a684c1e27da9517e..f7b232caa283482930225544d6b448d9dba61c8c 100644 (file)
--- a/Documentation/git-replay.txt
+++ b/Documentation/git-replay.txt
@@ -9,16 +9,16 @@ git-replay - EXPERIMENTAL: Replay commits on a new base, works with bare repos t
 SYNOPSIS
 --------
 [verse]
-(EXPERIMENTAL!) 'git replay' --onto <newbase> <oldbase> <branch>
+(EXPERIMENTAL!) 'git replay' --onto <newbase> <revision-range>...
 
 DESCRIPTION
 -----------
 
-Takes a range of commits, specified by <oldbase> and <branch>, and
-replays them onto a new location (see `--onto` option below). Leaves
+Takes ranges of commits and replays them onto a new location. Leaves
 the working tree and the index untouched, and updates no references.
 The output of this command is meant to be used as input to
-`git update-ref --stdin`, which would update the relevant branches.
+`git update-ref --stdin`, which would update the relevant branches
+(see the OUTPUT section below).
 
 THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
 
@@ -28,6 +28,30 @@ OPTIONS
 --onto <newbase>::
        Starting point at which to create the new commits.  May be any
        valid commit, and not just an existing branch name.
++
+The update-ref command(s) in the output will update the branch(es) in
+the revision range to point at the new commits, similar to the way how
+`git rebase --update-refs` updates multiple branches in the affected
+range.
+
+<revision-range>::
+       Range of commits to replay; see "Specifying Ranges" in
+       linkgit:git-rev-parse and the "Commit Limiting" options below.
+
+include::rev-list-options.txt[]
+
+OUTPUT
+------
+
+When there are no conflicts, the output of this command is usable as
+input to `git update-ref --stdin`.  It is of the form:
+
+       update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH}
+       update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH}
+       update refs/heads/branch3 ${NEW_branch3_HASH} ${OLD_branch3_HASH}
+
+where the number of refs updated depends on the arguments passed and
+the shape of the history being replayed.
 
 EXIT STATUS
 -----------
@@ -37,6 +61,32 @@ the replay has conflicts, the exit status is 1.  If the replay is not
 able to complete (or start) due to some kind of error, the exit status
 is something other than 0 or 1.
 
+EXAMPLES
+--------
+
+To simply rebase `mybranch` onto `target`:
+
+------------
+$ git replay --onto target origin/main..mybranch
+update refs/heads/mybranch ${NEW_mybranch_HASH} ${OLD_mybranch_HASH}
+------------
+
+When calling `git replay`, one does not need to specify a range of
+commits to replay using the syntax `A..B`; any range expression will
+do:
+
+------------
+$ git replay --onto origin/main ^base branch1 branch2 branch3
+update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH}
+update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH}
+update refs/heads/branch3 ${NEW_branch3_HASH} ${OLD_branch3_HASH}
+------------
+
+This will simultaneously rebase `branch1`, `branch2`, and `branch3`,
+all commits they have since `base`, playing them on top of
+`origin/main`. These three branches may have commits on top of `base`
+that they have in common, but that does not need to be the case.
+
 GIT
 ---
 Part of the linkgit:git[1] suite

diff --git a/builtin/replay.c b/builtin/replay.c
index bfccbbbfea7b4bc8bf96a07d9ff109e7f12901a0..3d5e00147bfa834ae829e1fa522888b3252daf3c 100644 (file)
--- a/builtin/replay.c
+++ b/builtin/replay.c
@@ -14,7 +14,6 @@
 #include "parse-options.h"
 #include "refs.h"
 #include "revision.h"
-#include "strvec.h"
 #include <oidset.h>
 #include <tree.h>
 
@@ -118,16 +117,14 @@ int cmd_replay(int argc, const char **argv, const char *prefix)
        struct commit *onto;
        const char *onto_name = NULL;
        struct commit *last_commit = NULL;
-       struct strvec rev_walk_args = STRVEC_INIT;
        struct rev_info revs;
        struct commit *commit;
        struct merge_options merge_opt;
        struct merge_result result;
-       struct strbuf branch_name = STRBUF_INIT;
        int ret = 0;
 
        const char * const replay_usage[] = {
-               N_("(EXPERIMENTAL!) git replay --onto <newbase> <oldbase> <branch>"),
+               N_("(EXPERIMENTAL!) git replay --onto <newbase> <revision-range>..."),
                NULL
        };
        struct option replay_options[] = {
@@ -145,18 +142,10 @@ int cmd_replay(int argc, const char **argv, const char *prefix)
                usage_with_options(replay_usage, replay_options);
        }
 
-       if (argc != 3) {
-               error(_("bad number of arguments"));
-               usage_with_options(replay_usage, replay_options);
-       }
-
        onto = peel_committish(onto_name);
-       strbuf_addf(&branch_name, "refs/heads/%s", argv[2]);
 
        repo_init_revisions(the_repository, &revs, prefix);
 
-       strvec_pushl(&rev_walk_args, "", argv[2], "--not", argv[1], NULL);
-
        /*
         * Set desired values for rev walking options here. If they
         * are changed by some user specified option in setup_revisions()
@@ -171,8 +160,9 @@ int cmd_replay(int argc, const char **argv, const char *prefix)
        revs.topo_order = 1;
        revs.simplify_history = 0;
 
-       if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1) {
-               ret = error(_("unhandled options"));
+       argc = setup_revisions(argc, argv, &revs, NULL);
+       if (argc > 1) {
+               ret = error(_("unrecognized argument: %s"), argv[1]);
                goto cleanup;
        }
 
@@ -205,8 +195,6 @@ int cmd_replay(int argc, const char **argv, const char *prefix)
                revs.simplify_history = 0;
        }
 
-       strvec_clear(&rev_walk_args);
-
        if (prepare_revision_walk(&revs) < 0) {
                ret = error(_("error preparing revisions"));
                goto cleanup;
@@ -248,7 +236,6 @@ int cmd_replay(int argc, const char **argv, const char *prefix)
        ret = result.clean;
 
 cleanup:
-       strbuf_release(&branch_name);
        release_revisions(&revs);
 
        /* Return */

diff --git a/t/t3650-replay-basics.sh b/t/t3650-replay-basics.sh
index 3567c98362fea878e6103d2939373b5f3ecd7b26..a1da4f9ef9afeb17dfef5a7bcc101aa7ac2e32ac 100755 (executable)
--- a/t/t3650-replay-basics.sh
+++ b/t/t3650-replay-basics.sh
@@ -52,7 +52,7 @@ test_expect_success 'setup bare' '
 '
 
 test_expect_success 'using replay to rebase two branches, one on top of other' '
-       git replay --onto main topic1 topic2 >result &&
+       git replay --onto main topic1..topic2 >result &&
 
        test_line_count = 1 result &&
 
@@ -68,8 +68,16 @@ test_expect_success 'using replay to rebase two branches, one on top of other' '
 '
 
 test_expect_success 'using replay on bare repo to rebase two branches, one on top of other' '
-       git -C bare replay --onto main topic1 topic2 >result-bare &&
+       git -C bare replay --onto main topic1..topic2 >result-bare &&
        test_cmp expect result-bare
 '
 
+test_expect_success 'using replay to rebase with a conflict' '
+       test_expect_code 1 git replay --onto topic1 B..conflict
+'
+
+test_expect_success 'using replay on bare repo to rebase with a conflict' '
+       test_expect_code 1 git -C bare replay --onto topic1 B..conflict
+'
+
 test_done

diff --git a/t/t6429-merge-sequence-rename-caching.sh b/t/t6429-merge-sequence-rename-caching.sh
index 099aefeffccf28b8b661c1efa4172e4c69ae770b..0f39ed0d08a34230c7c42f307992c20cc8b06d02 100755 (executable)
--- a/t/t6429-merge-sequence-rename-caching.sh
+++ b/t/t6429-merge-sequence-rename-caching.sh
@@ -71,7 +71,7 @@ test_expect_success 'caching renames does not preclude finding new ones' '
 
                git switch upstream &&
 
-               git replay --onto HEAD upstream~1 topic >out &&
+               git replay --onto HEAD upstream~1..topic >out &&
                git update-ref --stdin <out &&
                git checkout topic &&
 
@@ -141,7 +141,7 @@ test_expect_success 'cherry-pick both a commit and its immediate revert' '
                GIT_TRACE2_PERF="$(pwd)/trace.output" &&
                export GIT_TRACE2_PERF &&
 
-               git replay --onto HEAD upstream~1 topic >out &&
+               git replay --onto HEAD upstream~1..topic >out &&
                git update-ref --stdin <out &&
                git checkout topic &&
 
@@ -201,7 +201,7 @@ test_expect_success 'rename same file identically, then reintroduce it' '
                GIT_TRACE2_PERF="$(pwd)/trace.output" &&
                export GIT_TRACE2_PERF &&
 
-               git replay --onto HEAD upstream~1 topic >out &&
+               git replay --onto HEAD upstream~1..topic >out &&
                git update-ref --stdin <out &&
                git checkout topic &&
 
@@ -279,7 +279,7 @@ test_expect_success 'rename same file identically, then add file to old dir' '
                GIT_TRACE2_PERF="$(pwd)/trace.output" &&
                export GIT_TRACE2_PERF &&
 
-               git replay --onto HEAD upstream~1 topic >out &&
+               git replay --onto HEAD upstream~1..topic >out &&
                git update-ref --stdin <out &&
                git checkout topic &&
 
@@ -357,7 +357,7 @@ test_expect_success 'cached dir rename does not prevent noticing later conflict'
                GIT_TRACE2_PERF="$(pwd)/trace.output" &&
                export GIT_TRACE2_PERF &&
 
-               test_must_fail git replay --onto HEAD upstream~1 topic >output &&
+               test_must_fail git replay --onto HEAD upstream~1..topic >output &&
 
                grep region_enter.*diffcore_rename trace.output >calls &&
                test_line_count = 2 calls
@@ -456,7 +456,7 @@ test_expect_success 'dir rename unneeded, then add new file to old dir' '
                GIT_TRACE2_PERF="$(pwd)/trace.output" &&
                export GIT_TRACE2_PERF &&
 
-               git replay --onto HEAD upstream~1 topic >out &&
+               git replay --onto HEAD upstream~1..topic >out &&
                git update-ref --stdin <out &&
                git checkout topic &&
 
@@ -523,7 +523,7 @@ test_expect_success 'dir rename unneeded, then rename existing file into old dir
                GIT_TRACE2_PERF="$(pwd)/trace.output" &&
                export GIT_TRACE2_PERF &&
 
-               git replay --onto HEAD upstream~1 topic >out &&
+               git replay --onto HEAD upstream~1..topic >out &&
                git update-ref --stdin <out &&
                git checkout topic &&
 
@@ -626,7 +626,7 @@ test_expect_success 'caching renames only on upstream side, part 1' '
                GIT_TRACE2_PERF="$(pwd)/trace.output" &&
                export GIT_TRACE2_PERF &&
 
-               git replay --onto HEAD upstream~1 topic >out &&
+               git replay --onto HEAD upstream~1..topic >out &&
                git update-ref --stdin <out &&
                git checkout topic &&
 
@@ -685,7 +685,7 @@ test_expect_success 'caching renames only on upstream side, part 2' '
                GIT_TRACE2_PERF="$(pwd)/trace.output" &&
                export GIT_TRACE2_PERF &&
 
-               git replay --onto HEAD upstream~1 topic >out &&
+               git replay --onto HEAD upstream~1..topic >out &&
                git update-ref --stdin <out &&
                git checkout topic &&