From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: [PATCH 08/14] revert: Separate cmdline parsing from functional code
Date: Wed, 6 Jul 2011 07:54:22 +0000 [thread overview]
Message-ID: <1309938868-2028-9-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1309938868-2028-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 continuing the
cherry-pick or revert.
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 f34e51f..e3a7c9e 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -555,17 +555,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"));
@@ -599,7 +594,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)
die(_("%s failed"), me);
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)
die(_("%s failed"), me);
return res;
--
1.7.5.GIT
next prev parent reply other threads:[~2011-07-06 7:54 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-06 7:54 [GSoC update] Sequencer: The insn sheet format Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 01/14] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-07-06 8:35 ` Jonathan Nieder
2011-07-06 9:28 ` Ramkumar Ramachandra
2011-07-06 10:03 ` Jonathan Nieder
2011-07-06 7:54 ` [PATCH 02/14] revert: Inline add_message_to_msg function Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 03/14] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 04/14] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 05/14] revert: Propogate errors upwards from do_pick_commit Ramkumar Ramachandra
2011-07-06 8:50 ` Jonathan Nieder
2011-07-06 9:30 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 06/14] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-07-06 8:55 ` Jonathan Nieder
2011-07-06 9:37 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 07/14] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-07-06 9:09 ` Jonathan Nieder
2011-07-06 11:20 ` Ramkumar Ramachandra
2011-07-06 12:06 ` Jonathan Nieder
2011-07-12 6:14 ` Ramkumar Ramachandra
2011-07-06 21:20 ` Junio C Hamano
2011-07-12 6:21 ` Ramkumar Ramachandra
2011-07-12 6:33 ` Jonathan Nieder
2011-07-06 7:54 ` Ramkumar Ramachandra [this message]
2011-07-06 9:13 ` [PATCH 08/14] revert: Separate cmdline parsing from functional code Jonathan Nieder
2011-07-06 9:34 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 09/14] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-07-06 9:20 ` Jonathan Nieder
2011-07-06 7:54 ` [PATCH 10/14] revert: Persist data for continuation Ramkumar Ramachandra
2011-07-06 10:01 ` Jonathan Nieder
2011-07-06 11:55 ` Ramkumar Ramachandra
2011-07-06 21:20 ` Junio C Hamano
2011-07-06 7:54 ` [PATCH 11/14] revert: Introduce a layer of indirection over pick_commits Ramkumar Ramachandra
2011-07-06 10:37 ` Jonathan Nieder
2011-07-06 11:24 ` Ramkumar Ramachandra
2011-07-06 11:39 ` Jonathan Nieder
2011-07-06 11:44 ` Ramkumar Ramachandra
2011-07-06 11:53 ` Jonathan Nieder
2011-07-06 21:00 ` Junio C Hamano
2011-07-07 6:31 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 12/14] revert: Introduce --reset to cleanup sequencer data Ramkumar Ramachandra
2011-07-06 10:14 ` Jonathan Nieder
2011-07-06 10:55 ` Ramkumar Ramachandra
2011-07-06 14:32 ` Ramkumar Ramachandra
2011-07-06 19:21 ` Jonathan Nieder
2011-07-06 19:56 ` Jonathan Nieder
2011-07-07 3:03 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 13/14] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-07-06 10:25 ` Jonathan Nieder
2011-07-06 21:21 ` Junio C Hamano
2011-07-06 21:52 ` Drew Northup
2011-07-07 6:35 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [RFC PATCH 14/14] revert: Change insn sheet format Ramkumar Ramachandra
2011-07-06 10:33 ` Jonathan Nieder
2011-07-06 10:49 ` Ramkumar Ramachandra
2011-07-06 10:41 ` [GSoC update] Sequencer: The " 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=1309938868-2028-9-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@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).