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 11/14] revert: Introduce a layer of indirection over pick_commits
Date: Wed, 6 Jul 2011 07:54:25 +0000 [thread overview]
Message-ID: <1309938868-2028-12-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1309938868-2028-1-git-send-email-artagnon@gmail.com>
Write a new function called process_continuation 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 continuation functionality like "--continue" is
introduced later in the series.
Helped-by: Jonathan Nieder <jrnider@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
builtin/revert.c | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 7d76f92..8cdcdb6 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -677,10 +677,8 @@ static int cleanup_sequencer_data(void)
return 0;
}
-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;
@@ -690,12 +688,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_todo(todo_list, opts);
-
for (cur = todo_list; cur; cur = cur->next) {
save_todo(cur, opts);
res = do_pick_commit(cur->item, opts);
@@ -710,6 +702,22 @@ static int pick_commits(struct replay_opts *opts)
return cleanup_sequencer_data();
}
+static int process_continuation(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))
+ persist_head(sha1_to_hex(sha1));
+ persist_todo(todo_list, opts);
+
+ return pick_commits(todo_list, opts);
+}
+
int cmd_revert(int argc, const char **argv, const char *prefix)
{
int res;
@@ -722,7 +730,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_continuation(&opts);
if (res < 0)
die(_("%s failed"), me);
return res;
@@ -738,7 +752,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_continuation(&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 ` [PATCH 08/14] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-07-06 9:13 ` 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 ` Ramkumar Ramachandra [this message]
2011-07-06 10:37 ` [PATCH 11/14] revert: Introduce a layer of indirection over pick_commits 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-12-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).