From: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
To: rohit.ashiwal265@gmail.com
Cc: git@vger.kernel.org, newren@gmail.com, t.gummerer@gmail.com,
phillip.wood123@gmail.com, martin.agren@gmail.com,
jrnieder@gmail.com, gitster@pobox.com
Subject: [GSoC][PATCH v5 0/5] Teach cherry-pick/revert to skip commits
Date: Tue, 18 Jun 2019 22:36:45 +0530 [thread overview]
Message-ID: <20190618170650.22721-1-rohit.ashiwal265@gmail.com> (raw)
In-Reply-To: <20190608191958.4593-1-rohit.ashiwal265@gmail.com>
Here is another round of my patch, hopefully I have addressed all the changes.
- I have introduced a separate commit which changes `reset_merge` to use
`argv_array` instead of a manual `char *argv`. This will avoid specifying
array size and index and make code easier to read and extend
- Removed _() from BUG() messages
- Rearrange comments under `sequencer_skip`. I have not changed switch-case to
if-else since the former looked better to me
Thanks
Rohit Ashiwal (5):
sequencer: add advice for revert
sequencer: rename reset_for_rollback to reset_merge
sequencer: use argv_array in reset_merge
cherry-pick/revert: add --skip option
cherry-pick/revert: advise using --skip
Documentation/git-cherry-pick.txt | 4 +-
Documentation/git-revert.txt | 4 +-
Documentation/sequencer.txt | 4 +
builtin/commit.c | 13 +--
builtin/revert.c | 5 ++
sequencer.c | 131 ++++++++++++++++++++++++++----
sequencer.h | 1 +
t/t3510-cherry-pick-sequence.sh | 122 ++++++++++++++++++++++++++++
8 files changed, 258 insertions(+), 26 deletions(-)
Range-diff:
1: 59fa13c4d8 ! 1: 67c212090d sequencer: add advice for revert
@@ -41,7 +41,7 @@
+ _("try \"git cherry-pick (--continue | --abort | --quit)\"");
+ break;
+ default:
-+ BUG(_("unexpected action in create_seq_dir"));
++ BUG("unexpected action in create_seq_dir");
+ }
+ }
+ if (in_progress_error) {
2: dea4582591 = 2: 300d6f64f0 sequencer: rename reset_for_rollback to reset_merge
-: ---------- > 3: edc35f6a4c sequencer: use argv_array in reset_merge
3: 29686d828f ! 4: 825486c22d cherry-pick/revert: add --skip option
@@ -11,9 +11,8 @@
skipping commits easier for the user and to make the commands more
consistent.
- In the next commit, we will change the advice messages and some tests
- hence finishing the process of teaching revert and cherry-pick
- "how to skip commits".
+ In the next commit, we will change the advice messages hence finishing
+ the process of teaching revert and cherry-pick "how to skip commits".
Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
@@ -96,31 +95,6 @@
--- a/sequencer.c
+++ b/sequencer.c
@@
-
- static int reset_merge(const struct object_id *oid)
- {
-- const char *argv[4]; /* reset --merge <arg> + NULL */
-+ int ret;
-+ struct argv_array argv = ARGV_ARRAY_INIT;
-
-- argv[0] = "reset";
-- argv[1] = "--merge";
-- argv[2] = oid_to_hex(oid);
-- argv[3] = NULL;
-- return run_command_v_opt(argv, RUN_GIT_CMD);
-+ argv_array_pushl(&argv, "reset", "--merge", NULL);
-+
-+ if (!is_null_oid(oid))
-+ argv_array_push(&argv, oid_to_hex(oid));
-+
-+ ret = run_command_v_opt(argv.argv, RUN_GIT_CMD);
-+ argv_array_clear(&argv);
-+
-+ return ret;
- }
-
- static int rollback_single_pick(struct repository *r)
-@@
return reset_merge(&head_oid);
}
@@ -146,48 +120,40 @@
+ sequencer_get_last_command(r, &action);
+
+ /*
-+ * opts->action tells us which subcommand requested to skip
-+ * the commit.
++ * Check whether the subcommand requested to skip the commit is actually
++ * in progress and that it's safe to skip the commit.
++ *
++ * opts->action tells us which subcommand requested to skip the commit.
++ * If the corresponding .git/<ACTION>_HEAD exists, we know that the
++ * action is in progress and we can skip the commit.
++ *
++ * Otherwise we check that the last instruction was related to the
++ * particular subcommand we're trying to execute and barf if that's not
++ * the case.
++ *
++ * Finally we check that the rollback is "safe", i.e., has the HEAD
++ * moved? In this case, it doesn't make sense to "reset the merge" and
++ * "skip the commit" as the user already handled this by committing. But
++ * we'd not want to barf here, instead give advice on how to proceed. We
++ * only need to check that when .git/<ACTION>_HEAD doesn't exist because
++ * it gets removed when the user commits, so if it still exists we're
++ * sure the user can't have committed before.
+ */
+ switch (opts->action) {
+ case REPLAY_REVERT:
-+ /*
-+ * If .git/REVERT_HEAD exists then we are sure that we are in
-+ * the middle of a revert and we allow to skip the commit.
-+ */
+ if (!file_exists(git_path_revert_head(r))) {
-+ /*
-+ * Check if the last instruction executed was related to
-+ * revert. If so, we are sure that a revert is in progress.
-+ *
-+ * NB: single commit revert is also counted in this
-+ * definition of "progress" (and was dealt with in the
-+ * previous check).
-+ */
-+ if (action == REPLAY_REVERT) {
-+ /*
-+ * Check if the user has moved the HEAD, i.e.,
-+ * already committed. In this case, we would like
-+ * to advise instead of skipping.
-+ */
-+ if (!rollback_is_safe())
-+ goto give_advice;
-+ else
-+ /* skip commit :) */
-+ break;
-+ }
-+ return error(_("no revert in progress"));
++ if (action != REPLAY_REVERT)
++ return error(_("no revert in progress"));
++ if (!rollback_is_safe())
++ goto give_advice;
+ }
+ break;
+ case REPLAY_PICK:
+ if (!file_exists(git_path_cherry_pick_head(r))) {
-+ if (action == REPLAY_PICK) {
-+ if (!rollback_is_safe())
-+ goto give_advice;
-+ else
-+ break;
-+ }
-+ return error(_("no cherry-pick in progress"));
++ if (action != REPLAY_PICK)
++ return error(_("no cherry-pick in progress"));
++ if (!rollback_is_safe())
++ goto give_advice;
+ }
+ break;
+ default:
4: 941e73b654 ! 5: 63dbc11ab1 cherry-pick/revert: advise using --skip
@@ -62,7 +62,7 @@
+ _("try \"git cherry-pick (--continue | %s--abort | --quit)\"");
break;
default:
- BUG(_("unexpected action in create_seq_dir"));
+ BUG("unexpected action in create_seq_dir");
@@
}
if (in_progress_error) {
--
2.21.0
next prev parent reply other threads:[~2019-06-18 17:09 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-08 19:19 [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits Rohit Ashiwal
2019-06-08 19:19 ` [GSoC][PATCH 1/3] sequencer: add advice for revert Rohit Ashiwal
2019-06-09 17:52 ` Phillip Wood
2019-06-10 5:13 ` Rohit Ashiwal
2019-06-10 10:39 ` Phillip Wood
2019-06-10 13:25 ` Rohit Ashiwal
2019-06-10 17:46 ` Phillip Wood
2019-06-10 16:34 ` Junio C Hamano
2019-06-08 19:19 ` [GSoC][PATCH 2/3] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-09 8:37 ` Thomas Gummerer
2019-06-09 18:01 ` Phillip Wood
2019-06-10 5:57 ` Rohit Ashiwal
2019-06-10 10:40 ` Phillip Wood
2019-06-10 13:43 ` Rohit Ashiwal
2019-06-10 17:47 ` Phillip Wood
2019-06-08 19:19 ` [GSoC][PATCH 3/3] cherry-pick/revert: update hints Rohit Ashiwal
2019-06-09 8:42 ` Thomas Gummerer
2019-06-09 18:03 ` Phillip Wood
2019-06-10 5:28 ` Rohit Ashiwal
2019-06-10 10:40 ` Phillip Wood
2019-06-10 13:33 ` Rohit Ashiwal
2019-06-10 17:47 ` Phillip Wood
2019-06-09 9:02 ` [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits Thomas Gummerer
2019-06-09 10:06 ` Rohit Ashiwal
2019-06-09 20:00 ` Thomas Gummerer
2019-06-11 7:31 ` [GSoC][PATCH v2 " Rohit Ashiwal
2019-06-11 7:31 ` [GSoC][PATCH v2 1/3] sequencer: add advice for revert Rohit Ashiwal
2019-06-11 21:25 ` Junio C Hamano
2019-06-11 7:31 ` [GSoC][PATCH v2 2/3] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-12 13:31 ` Phillip Wood
2019-06-12 18:11 ` Junio C Hamano
2019-06-12 18:57 ` Phillip Wood
2019-06-11 7:31 ` [GSoC][PATCH v2 3/3] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-06-12 15:16 ` Phillip Wood
2019-06-13 4:05 ` [GSoC][PATCH v3 0/3] Teach cherry-pick/revert to skip commits Rohit Ashiwal
2019-06-13 4:05 ` [GSoC][PATCH v3 1/3] sequencer: add advice for revert Rohit Ashiwal
2019-06-13 17:45 ` Phillip Wood
2019-06-13 19:21 ` Martin Ågren
2019-06-13 20:59 ` Junio C Hamano
2019-06-14 3:44 ` Rohit Ashiwal
2019-06-14 3:43 ` Rohit Ashiwal
2019-06-13 4:05 ` [GSoC][PATCH v3 2/3] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-13 17:56 ` Junio C Hamano
2019-06-13 19:57 ` Junio C Hamano
2019-06-14 3:48 ` Rohit Ashiwal
2019-06-14 3:45 ` Rohit Ashiwal
2019-06-14 15:58 ` Junio C Hamano
2019-06-16 7:03 ` Rohit Ashiwal
2019-06-13 17:59 ` Phillip Wood
2019-06-13 4:05 ` [GSoC][PATCH v3 3/3] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-06-16 8:20 ` [GSoC][PATCH v4 0/4] [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits Rohit Ashiwal
2019-06-16 8:20 ` [GSoC][PATCH v4 1/4] sequencer: add advice for revert Rohit Ashiwal
2019-06-17 5:51 ` Thomas Gummerer
2019-06-16 8:20 ` [GSoC][PATCH v4 2/4] sequencer: rename reset_for_rollback to reset_merge Rohit Ashiwal
2019-06-16 8:20 ` [GSoC][PATCH v4 3/4] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-17 8:30 ` Thomas Gummerer
2019-06-16 8:20 ` [GSoC][PATCH v4 4/4] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-06-17 8:39 ` [GSoC][PATCH v4 0/4] [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits Thomas Gummerer
2019-06-18 17:06 ` Rohit Ashiwal [this message]
2019-06-18 17:06 ` [GSoC][PATCH v5 1/5] sequencer: add advice for revert Rohit Ashiwal
2019-06-18 17:06 ` [GSoC][PATCH v5 2/5] sequencer: rename reset_for_rollback to reset_merge Rohit Ashiwal
2019-06-18 17:06 ` [GSoC][PATCH v5 3/5] sequencer: use argv_array in reset_merge Rohit Ashiwal
2019-06-18 17:06 ` [GSoC][PATCH v5 4/5] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-20 3:40 ` Junio C Hamano
2019-06-20 9:46 ` Rohit Ashiwal
2019-06-20 9:57 ` Phillip Wood
2019-06-20 20:09 ` Junio C Hamano
2019-06-20 10:02 ` Phillip Wood
2019-06-20 10:34 ` Rohit Ashiwal
2019-06-20 11:42 ` Phillip Wood
2019-06-21 7:47 ` Rohit Ashiwal
2019-06-18 17:06 ` [GSoC][PATCH v5 5/5] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-06-21 9:17 ` [GSoC][PATCH v6 0/5] Teach cherry-pick/revert to skip commits Rohit Ashiwal
2019-06-21 9:17 ` [GSoC][PATCH v6 1/5] sequencer: add advice for revert Rohit Ashiwal
2019-06-21 9:17 ` [GSoC][PATCH v6 2/5] sequencer: rename reset_for_rollback to reset_merge Rohit Ashiwal
2019-06-21 9:17 ` [GSoC][PATCH v6 3/5] sequencer: use argv_array in reset_merge Rohit Ashiwal
2019-06-21 9:17 ` [GSoC][PATCH v6 4/5] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-21 9:18 ` [GSoC][PATCH v6 5/5] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-06-21 19:09 ` [GSoC][PATCH v6 0/5] Teach cherry-pick/revert to skip commits Junio C Hamano
2019-06-23 20:03 ` [GSoC][PATCH v7 0/6] " Rohit Ashiwal
2019-06-23 20:03 ` [GSoC][PATCH v7 1/6] advice: add sequencerInUse config variable Rohit Ashiwal
2019-06-25 9:18 ` Thomas Gummerer
2019-06-23 20:03 ` [GSoC][PATCH v7 2/6] sequencer: add advice for revert Rohit Ashiwal
2019-06-29 14:05 ` Phillip Wood
2019-06-23 20:03 ` [GSoC][PATCH v7 3/6] sequencer: rename reset_for_rollback to reset_merge Rohit Ashiwal
2019-06-23 20:03 ` [GSoC][PATCH v7 4/6] sequencer: use argv_array in reset_merge Rohit Ashiwal
2019-06-23 20:03 ` [GSoC][PATCH v7 5/6] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-23 20:03 ` [GSoC][PATCH v7 6/6] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 0/5] Teach cherry-pick/revert to skip commits Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 1/5] sequencer: add advice for revert Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 2/5] sequencer: rename reset_for_rollback to reset_merge Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 3/5] sequencer: use argv_array in reset_merge Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 4/5] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 5/5] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-07-02 15:26 ` [GSoC][PATCH v8 0/5] Teach cherry-pick/revert to skip commits Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190618170650.22721-1-rohit.ashiwal265@gmail.com \
--to=rohit.ashiwal265@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=martin.agren@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=t.gummerer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).