On Mon, Aug 1, 2016 at 5:12 AM, Johannes Schindelin
<johannes.schinde...@gmx.de> wrote:
> Hi Stephen,
>
> On Wed, 27 Jul 2016, Stephen Morton wrote:
>
>> On Wed, Jul 27, 2016 at 11:03 AM, Johannes Schindelin
>> <johannes.schinde...@gmx.de> wrote:
>> >
>> > On Wed, 27 Jul 2016, Stephen Morton wrote:
>> >
>> >> diff --git a/sequencer.c b/sequencer.c
>> >> index cdfac82..ce06876 100644
>> >> --- a/sequencer.c
>> >> +++ b/sequencer.c
>> >> @@ -176,7 +176,8 @@ static void print_advice(int show_hint, struct
>> >> replay_opts *opts)
>> >> else
>> >> advise(_("after resolving the conflicts, mark
>> >> the corrected paths\n"
>> >> "with 'git add <paths>' or 'git rm
>> >> <paths>'\n"
>> >> - "and commit the result with 'git
>> >> commit'"));
>> >> + "then continue the %s with 'git %s
>> >> --continue'\n"
>> >> + "or cancel the %s operation with 'git
>> >> %s --abort'" ), action_name(opts), action_name(opts),
>> >> action_name(opts), action_name(opts));
>> >
>> > That is an awful lot of repetition right there, with an added
>> > inconsistency that the action is referred to by its name alone in the
>> > "--continue" case, but with "operation" added in the "--abort" case.
>> >
>> > And additionally, in the most common case (one commit to cherry-pick), the
>> > advice now suggests a more complicated operation than necessary: a simply
>> > `git commit` would be enough, then.
>> >
>> > Can't we have a test whether this is the last of the commits to be
>> > cherry-picked, and if so, have the simpler advice again?
>>
>> Ok, knowing that I'm not on the last element of the sequencer is
>> beyond my git code knowledge.
>
> Oh, my mistake: I meant to say that this information could be easily
> provided by `pick_commits()` if it passed it to `print_advice()` via
> `do_pick_commit()`.
>
> Ciao,
> Johannes
(Finally getting back to this.)
Something like this, then Johannes?
(I intentionally print the '--continue' hint even in the case where
it's last of n commits that fails.)
~/ws/extern/git (maint *%>) > git diff
diff --git a/sequencer.c b/sequencer.c
index 617a3df..e0071aa 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -154,7 +154,7 @@ static void free_message(struct commit *commit,
struct commit_message *msg)
unuse_commit_buffer(commit, msg->message);
}
-static void print_advice(int show_hint, struct replay_opts *opts)
+static void print_advice(int show_hint, int multiple_commits, struct
replay_opts *opts)
{
char *msg = getenv("GIT_CHERRY_PICK_HELP");
@@ -174,14 +174,14 @@ static void print_advice(int show_hint, struct
replay_opts *opts)
advise(_("after resolving the conflicts, mark
the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"));
else
- if (! file_exists(git_path_seq_dir()))
- advise(_("after resolving the
conflicts, mark the corrected paths\n"
- "with 'git add <paths>' or
'git rm <paths>'\n"
- "and commit the
result with 'git commit'"));
- else
+ if (multiple_commits)
advise(_("after resolving the
conflicts, mark the corrected paths with 'git add <paths>' or 'git rm
<paths>'\n"
"then continue with 'git %s
--continue'\n"
"or cancel with 'git %s
--abort'" ), action_name(opts), action_name(opts));
+ else
+ advise(_("after resolving the
conflicts, mark the corrected paths\n"
+ "with 'git add <paths>' or
'git rm <paths>'\n"
+ "and commit the result with
'git commit'"));
}
}
@@ -445,7 +445,7 @@ static int allow_empty(struct replay_opts *opts,
struct commit *commit)
return 1;
}
-static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
+static int do_pick_commit(struct commit *commit, struct replay_opts
*opts, int multiple_commits)
{
unsigned char head[20];
struct commit *base, *next, *parent;
@@ -600,7 +600,7 @@ static int do_pick_commit(struct commit *commit,
struct replay_opts *opts)
: _("could not apply %s... %s"),
find_unique_abbrev(commit->object.oid.hash,
DEFAULT_ABBREV),
msg.subject);
- print_advice(res == 1, opts);
+ print_advice(res == 1, multiple_commits, opts);
rerere(opts->allow_rerere_auto);
goto leave;
}
@@ -964,6 +964,7 @@ static int pick_commits(struct commit_list
*todo_list, struct replay_opts *opts)
{
struct commit_list *cur;
int res;
+ int multiple_commits = (todo_list->next) != NULL;
setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
if (opts->allow_ff)
@@ -973,7 +974,7 @@ static int pick_commits(struct commit_list
*todo_list, struct replay_opts *opts)
for (cur = todo_list; cur; cur = cur->next) {
save_todo(cur, opts);
- res = do_pick_commit(cur->item, opts);
+ res = do_pick_commit(cur->item, opts, multiple_commits);
if (res)
return res;
}
@@ -1021,7 +1022,7 @@ static int sequencer_continue(struct replay_opts *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);
+ return do_pick_commit(cmit, opts, 0);
}
int sequencer_pick_revisions(struct replay_opts *opts)
~/ws/extern/git (maint *%>) > git diff @{u}
diff --git a/sequencer.c b/sequencer.c
index c6362d6..e0071aa 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -154,7 +154,7 @@ static void free_message(struct commit *commit,
struct commit_message *msg)
unuse_commit_buffer(commit, msg->message);
}
-static void print_advice(int show_hint, struct replay_opts *opts)
+static void print_advice(int show_hint, int multiple_commits, struct
replay_opts *opts)
{
char *msg = getenv("GIT_CHERRY_PICK_HELP");
@@ -174,9 +174,14 @@ static void print_advice(int show_hint, struct
replay_opts *opts)
advise(_("after resolving the conflicts, mark
the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"));
else
- advise(_("after resolving the conflicts, mark
the corrected paths\n"
- "with 'git add <paths>' or 'git rm <paths>'\n"
- "and commit the result with 'git commit'"));
+ if (multiple_commits)
+ advise(_("after resolving the
conflicts, mark the corrected paths with 'git add <paths>' or 'git rm
<paths>'\n"
+ "then continue with 'git %s
--continue'\n"
+ "or cancel with 'git %s
--abort'" ), action_name(opts), action_name(opts));
+ else
+ advise(_("after resolving the
conflicts, mark the corrected paths\n"
+ "with 'git add <paths>' or
'git rm <paths>'\n"
+ "and commit the result with
'git commit'"));
}
}
@@ -440,7 +445,7 @@ static int allow_empty(struct replay_opts *opts,
struct commit *commit)
return 1;
}
-static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
+static int do_pick_commit(struct commit *commit, struct replay_opts
*opts, int multiple_commits)
{
unsigned char head[20];
struct commit *base, *next, *parent;
@@ -595,7 +600,7 @@ static int do_pick_commit(struct commit *commit,
struct replay_opts *opts)
: _("could not apply %s... %s"),
find_unique_abbrev(commit->object.oid.hash,
DEFAULT_ABBREV),
msg.subject);
- print_advice(res == 1, opts);
+ print_advice(res == 1, multiple_commits, opts);
rerere(opts->allow_rerere_auto);
goto leave;
}
@@ -959,6 +964,7 @@ static int pick_commits(struct commit_list
*todo_list, struct replay_opts *opts)
{
struct commit_list *cur;
int res;
+ int multiple_commits = (todo_list->next) != NULL;
setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
if (opts->allow_ff)
@@ -968,7 +974,7 @@ static int pick_commits(struct commit_list
*todo_list, struct replay_opts *opts)
for (cur = todo_list; cur; cur = cur->next) {
save_todo(cur, opts);
- res = do_pick_commit(cur->item, opts);
+ res = do_pick_commit(cur->item, opts, multiple_commits);
if (res)
return res;
}
@@ -1016,7 +1022,7 @@ static int sequencer_continue(struct replay_opts *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);
+ return do_pick_commit(cmit, opts, 0);
}
int sequencer_pick_revisions(struct replay_opts *opts)
------
Stephen
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
