[PATCH 08/13] revert: Separate cmdline parsing from functional code
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Jun 21, 2011, 13:04 UTC
- Message-ID
- <1308661489-20080-9-git-send-email-artagnon@gmail.com>
- In-Reply-To
- <1308661489-20080-1-git-send-email-artagnon@gmail.com>
Currently, revert_or_cherry_pick does too many things including argument parsing and setting up to pick the commits; this doesn't make a good API. Simplify and rename the function to pick_commits, so that it just has the responsibility of setting up the revision walker and calling do_pick_commit in a loop. Transfer the remaining work to its callers cmd_cherry_pick and cmd_revert. Later in the series, pick_commits will serve as the starting point for continuation.
Inspired-by: Christian Couder <chriscool@tuxfamily.org> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> --- builtin/revert.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c index e2e290c..93e0531 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -551,17 +551,12 @@ static void read_and_refresh_cache(const char *me, struct replay_opts *opts) rollback_lock_file(&index_lock); } -static int revert_or_cherry_pick(int argc, const char **argv, - struct replay_opts *opts) +static int pick_commits(struct replay_opts *opts) { struct rev_info revs; struct commit *commit; - git_config(git_default_config, NULL); - me = opts->action == REVERT ? "revert" : "cherry-pick"; setenv(GIT_REFLOG_ACTION, me, 0); - parse_args(argc, argv, opts); - if (opts->allow_ff) { if (opts->signoff) die(_("cherry-pick --ff cannot be used with --signoff")); @@ -595,7 +590,10 @@ int cmd_revert(int argc, const char **argv, const char *prefix) if (isatty(0)) opts.edit = 1; opts.action = REVERT; - res = revert_or_cherry_pick(argc, argv, &opts); + git_config(git_default_config, NULL); + me = "revert"; + parse_args(argc, argv, &opts); + res = pick_commits(&opts); if (res > 0) /* Exit status from conflict */ return res; @@ -612,7 +610,10 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix) memset(&opts, 0, sizeof(struct replay_opts)); opts.action = CHERRY_PICK; - res = revert_or_cherry_pick(argc, argv, &opts); + git_config(git_default_config, NULL); + me = "cherry-pick"; + parse_args(argc, argv, &opts); + res = pick_commits(&opts); if (res > 0) return res; if (res < 0)
-- 1.7.5.GIT