From: Ramkumar Ramachandra Date: Mon, 11 Jul 2011 14:54:04 GMT Subject: [PATCH 13/17] revert: Introduce a layer of indirection over pick_commits Message-ID: <1310396048-24925-14-git-send-email-artagnon@gmail.com> In-Reply-To: <1310396048-24925-1-git-send-email-artagnon@gmail.com> Write a new function called process_subcommand to prepare a todo_list to call pick_commits with; the job of pick_commits is simplified into performing the tasks listed in todo_list. This will be useful when subcommands like "--reset" and "--continue" are introduced later in the series. Helped-by: Jonathan Nieder Signed-off-by: Ramkumar Ramachandra --- builtin/revert.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index edf74fb..f9f5e3a 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -976,10 +976,8 @@ static void save_opts(struct replay_opts *opts) strbuf_release(&buf); } -static int pick_commits(struct replay_opts *opts) +static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts) { - struct commit_list *todo_list = NULL; - unsigned char sha1[20]; struct commit_list *cur; int res; @@ -989,13 +987,6 @@ static int pick_commits(struct replay_opts *opts) opts->record_origin || opts->edit)); read_and_refresh_cache(me, opts); - walk_revs_populate_todo(&todo_list, opts); - create_seq_dir(); - if (!get_sha1("HEAD", sha1)) - save_head(sha1_to_hex(sha1)); - save_opts(opts); - save_todo(todo_list, opts); - for (cur = todo_list; cur; cur = cur->next) { save_todo(cur, opts); res = do_pick_commit(cur->item, opts); @@ -1011,6 +1002,23 @@ static int pick_commits(struct replay_opts *opts) return 0; } +static int process_subcommand(struct replay_opts *opts) +{ + struct commit_list *todo_list = NULL; + unsigned char sha1[20]; + + read_and_refresh_cache(me, opts); + + walk_revs_populate_todo(&todo_list, opts); + create_seq_dir(); + if (!get_sha1("HEAD", sha1)) + save_head(sha1_to_hex(sha1)); + save_opts(opts); + save_todo(todo_list, opts); + + return pick_commits(todo_list, opts); +} + int cmd_revert(int argc, const char **argv, const char *prefix) { int res; @@ -1023,7 +1031,13 @@ int cmd_revert(int argc, const char **argv, const char *prefix) git_config(git_default_config, NULL); me = "revert"; parse_args(argc, argv, &opts); - res = pick_commits(&opts); + + /* + * Decide what to do depending on the arguments; a fresh + * cherry-pick should be handled differently from an existing + * one that is being continued + */ + res = process_subcommand(&opts); if (res < 0) die(_("revert failed")); return res; @@ -1039,7 +1053,7 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix) git_config(git_default_config, NULL); me = "cherry-pick"; parse_args(argc, argv, &opts); - res = pick_commits(&opts); + res = process_subcommand(&opts); if (res < 0) die(_("cherry-pick failed")); return res; -- 1.7.5.GIT