From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Christian Couder <chriscool@tuxfamily.org>,
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>,
Jay Soffian <jaysoffian@gmail.com>
Subject: Re: [PATCH 4/7] revert: allow single-pick in the middle of cherry-pick sequence
Date: Wed, 14 Dec 2011 21:18:45 +0530 [thread overview]
Message-ID: <CALkWK0mt03SSNT-svUO1wHdq5OpM=0xQO3FHkSGGEDuW-jUEXA@mail.gmail.com> (raw)
In-Reply-To: <20111210125948.GE22035@elie.hsd1.il.comcast.net>
Hi,
Jonathan Nieder wrote:
> When I messed up a difficult conflict in the middle of a cherry-pick
> sequence, it can be useful to be able to 'git checkout HEAD . && git
> cherry-pick that-one-commit' to restart the conflict resolution.
I was about to complain about the commit message until I noticed that
Junio already fixed it in `next`:
revert: allow single-pick in the middle of cherry-pick sequence
After messing up a difficult conflict resolution in the middle of a
cherry-pick sequence, it can be useful to be able to
git checkout HEAD . && git cherry-pick that-one-commit
to restart the conflict resolution. The current code however errors out
saying that another cherry-pick is already in progress.
Interesting concept; let's see how it's implemented.
> Suggested-by: Johannes Sixt <j6t@kdbg.org>
Could you link to the corresponding thread with Johannes?
> diff --git a/builtin/revert.c b/builtin/revert.c
> index 71570357..dcb69904 100644
> --- a/builtin/revert.c
> +++ b/builtin/revert.c
> @@ -1072,6 +1072,12 @@ static int sequencer_continue(struct replay_opts *opts)
> return pick_commits(todo_list, opts);
> }
>
> +static int single_pick(struct commit *cmit, struct replay_opts *opts)
> +{
> + setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
> + return do_pick_commit(cmit, opts);
> +}
single_pick as opposed to the continue_single_pick introduced in 2/7.
> static int pick_revisions(struct replay_opts *opts)
> {
> struct commit_list *todo_list = NULL;
> @@ -1097,6 +1103,26 @@ static int pick_revisions(struct replay_opts *opts)
> return sequencer_continue(opts);
>
> /*
> + * If we were called as "git cherry-pick <commit>", just
> + * cherry-pick/revert it, set CHERRY_PICK_HEAD /
> + * REVERT_HEAD, and don't touch the sequencer state.
> + * This means it is possible to cherry-pick in the middle
> + * of a cherry-pick sequence.
> + */
Conceptually all very good. What I'm really interested in seeing is
how you persist opts for "cherry-pick --continue" when a single-commit
pick fails: in other words, how you manage to get " --continue of
single-pick respects -x" to pass.
> + if (opts->revs->cmdline.nr == 1 &&
> + opts->revs->cmdline.rev->whence == REV_CMD_REV &&
> + opts->revs->no_walk &&
> + !opts->revs->cmdline.rev->flags) {
Yuck, seriously.
1. I'd have expected you to check opts->revs->commits, not
opts->revs->cmdline.nr. Okay, you're using the cmdline because the
revision walk hasn't happened yet.
2. Why are you using opts->revs->cmdline.rev->whence as opposed to
opts->action? Why do you want to expose the underlying revision
walking mechanism?
3. When will the opts->revs->no_walk condition not be satisfied? Only
when you explicitly set it to 0 or NULL, right -- where is this
happening in revert.c?
4. Why are you checking flags? When is this condition not going to be
satisfied?
Since 3 and 4 indicate that you're being overly defensive, consistency
requires you to guarantee that this code will work no matter what the
rev_info struct is filled up with prior to this segment.
Is this true?
> + struct commit *cmit;
> + if (prepare_revision_walk(opts->revs))
> + die(_("revision walk setup failed"));
> + cmit = get_revision(opts->revs);
> + if (!cmit || get_revision(opts->revs))
> + die("BUG: expected exactly one commit from walk");
> + return single_pick(cmit, opts);
> + }
I'd have expected you to reuse prepare_revs().
> + /*
> * Start a new cherry-pick/ revert sequence; but
> * first, make sure that an existing one isn't in
> * progress
Since all your new code is a special case of "Start a new cherry-pick/
revert sequence", you don't check the sequencer state in the first
place.
> diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
> index 56c95ec1..98a27a23 100755
> --- a/t/t3510-cherry-pick-sequence.sh
> +++ b/t/t3510-cherry-pick-sequence.sh
> @@ -50,6 +50,18 @@ test_expect_success 'cherry-pick persists data on failure' '
> test_path_is_file .git/sequencer/opts
> '
>
> +test_expect_success 'cherry-pick mid-cherry-pick-sequence' '
> + pristine_detach initial &&
> + test_must_fail git cherry-pick base..anotherpick &&
> + test_cmp_rev picked CHERRY_PICK_HEAD &&
> + # "oops, I forgot that these patches rely on the change from base"
> + git checkout HEAD foo &&
> + git cherry-pick base &&
> + git cherry-pick picked &&
> + git cherry-pick --continue &&
> + git diff --exit-code anotherpick
> +'
Cute feature, although I don't ever recall needing it personally. Why
does this relatively esoteric "feature" belong along with the other
"maintenance patches" in jn/maint-sequencer-fixes?
-- Ram
next prev parent reply other threads:[~2011-12-14 15:49 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-20 7:30 cherry-pick/revert error messages Jonathan Nieder
2011-11-20 8:02 ` Ramkumar Ramachandra
2011-11-20 9:46 ` [RFC/PATCH 0/3] " Jonathan Nieder
2011-11-20 9:48 ` [PATCH 1/3] revert: rename --reset option to --quit Jonathan Nieder
2011-11-21 20:36 ` Junio C Hamano
2011-11-21 22:35 ` Jakub Narebski
2011-11-21 22:43 ` Jonathan Nieder
2011-11-20 9:50 ` [PATCH 2/3] revert: rearrange pick_revisions() for clarity Jonathan Nieder
2011-11-20 9:51 ` [PATCH 3/3] revert: improve error message for cherry-pick during cherry-pick Jonathan Nieder
2011-11-22 11:12 ` [PATCH v2 0/3] Re: cherry-pick/revert error messages Jonathan Nieder
2011-11-22 11:14 ` [PATCH 1/3] revert: rename --reset option to --quit Jonathan Nieder
2011-11-22 11:15 ` [PATCH 2/3] revert: rearrange pick_revisions() for clarity Jonathan Nieder
2011-11-22 11:15 ` [PATCH 3/3] revert: improve error message for cherry-pick during cherry-pick Jonathan Nieder
2011-11-22 11:17 ` [PATCH 4/3] revert: write REVERT_HEAD pseudoref during conflicted revert Jonathan Nieder
2011-11-22 21:40 ` Thiago Farina
2011-12-01 9:34 ` Ramkumar Ramachandra
2011-11-22 11:20 ` [PATCH 5/3] revert: introduce --abort to cancel a failed cherry-pick Jonathan Nieder
2011-11-23 0:43 ` Junio C Hamano
2011-11-23 1:27 ` Jonathan Nieder
2011-11-23 8:49 ` [PATCH] Fix revert --abort on Windows Johannes Sixt
2011-11-23 10:04 ` Jonathan Nieder
2011-11-23 10:21 ` Johannes Sixt
2011-12-10 12:46 ` [RFC/PATCH 0/7] some sequencer loose ends (Re: Fix revert --abort on Windows) Jonathan Nieder
2011-12-10 12:47 ` [PATCH 1/7] revert: give --continue handling its own function Jonathan Nieder
2011-12-14 13:16 ` Ramkumar Ramachandra
2011-12-10 12:49 ` [PATCH 2/7] revert: allow cherry-pick --continue to commit before resuming Jonathan Nieder
2011-12-14 14:26 ` Ramkumar Ramachandra
2011-12-14 16:48 ` Jonathan Nieder
2011-12-10 12:58 ` [PATCH 3/7] revert: pass around rev-list args in already-parsed form Jonathan Nieder
2011-12-14 14:51 ` Ramkumar Ramachandra
2011-12-10 12:59 ` [PATCH 4/7] revert: allow single-pick in the middle of cherry-pick sequence Jonathan Nieder
2011-12-14 15:48 ` Ramkumar Ramachandra [this message]
2011-12-14 16:21 ` Jonathan Nieder
2012-04-05 11:49 ` Ævar Arnfjörð Bjarmason
2012-04-05 12:15 ` Jonathan Nieder
2011-12-10 13:02 ` [PATCH 5/7] revert: do not remove state until sequence is finished Jonathan Nieder
2011-12-14 16:02 ` Ramkumar Ramachandra
2011-12-10 13:03 ` [PATCH 6/7] Revert "reset: Make reset remove the sequencer state" Jonathan Nieder
2011-12-14 16:06 ` Ramkumar Ramachandra
2011-12-10 13:06 ` [PATCH 7/7] revert: stop creating and removing sequencer-old directory Jonathan Nieder
2011-12-14 16:10 ` Ramkumar Ramachandra
2011-12-11 19:58 ` [RFC/PATCH 0/7] some sequencer loose ends (Re: Fix revert --abort on Windows) Jonathan Nieder
2011-12-12 8:15 ` Junio C Hamano
2011-12-12 21:31 ` Junio C Hamano
2011-12-14 9:57 ` Jonathan Nieder
2011-11-23 17:23 ` [PATCH] Fix revert --abort on Windows Alex Riesen
2011-11-30 22:52 ` [PATCH 5/3] revert: introduce --abort to cancel a failed cherry-pick Junio C Hamano
2011-11-22 11:20 ` [PATCH 6/3] revert: remove --reset compatibility option Jonathan Nieder
2011-11-22 21:49 ` Junio C Hamano
2011-11-22 23:11 ` Jonathan Nieder
2011-11-22 23:38 ` Junio C Hamano
2011-11-22 11:27 ` [PATCH v2 0/3] Re: cherry-pick/revert error messages Jonathan Nieder
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='CALkWK0mt03SSNT-svUO1wHdq5OpM=0xQO3FHkSGGEDuW-jUEXA@mail.gmail.com' \
--to=artagnon@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jaysoffian@gmail.com \
--cc=jrnieder@gmail.com \
--cc=martin.von.zweigbergk@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).