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>,
Jeff King <peff@peff.net>
Subject: [PATCH 12/18] revert: Save command-line options for continuing operation
Date: Tue, 19 Jul 2011 22:47:50 +0530 [thread overview]
Message-ID: <1311095876-3098-13-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1311095876-3098-1-git-send-email-artagnon@gmail.com>
In the same spirit as ".git/sequencer/head" and ".git/sequencer/todo",
introduce ".git/sequencer/opts" to persist the replay_opts structure
for continuing after a conflict resolution. Use the gitconfig format
for this file so that it looks like:
[core]
signoff = true
record-origin = true
mainline = 1
strategy = recursive
strategy-option = patience
strategy-option = ours
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
builtin/revert.c | 78 +++++++++++++++++++++++++++++++++++++++
t/t3510-cherry-pick-sequence.sh | 28 +++++++++++++-
2 files changed, 105 insertions(+), 1 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index cdfa906..a8ac5a1 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -65,6 +65,7 @@ struct replay_opts {
#define SEQ_DIR "sequencer"
#define SEQ_HEAD_FILE "sequencer/head"
#define SEQ_TODO_FILE "sequencer/todo"
+#define SEQ_OPTS_FILE "sequencer/opts"
static const char *action_name(const struct replay_opts *opts)
{
@@ -716,6 +717,49 @@ error:
die(_("Unusable instruction sheet: %s"), todo_file);
}
+static int populate_opts_cb(const char *key, const char *value, void *data)
+{
+ struct replay_opts *opts = data;
+ int error_flag = 1;
+
+ if (!value)
+ error_flag = 0;
+ else if (!strcmp(key, "core.no-commit"))
+ opts->no_commit = git_config_bool_or_int(key, value, &error_flag);
+ else if (!strcmp(key, "core.edit"))
+ opts->edit = git_config_bool_or_int(key, value, &error_flag);
+ else if (!strcmp(key, "core.signoff"))
+ opts->signoff = git_config_bool_or_int(key, value, &error_flag);
+ else if (!strcmp(key, "core.record-origin"))
+ opts->record_origin = git_config_bool_or_int(key, value, &error_flag);
+ else if (!strcmp(key, "core.allow-ff"))
+ opts->allow_ff = git_config_bool_or_int(key, value, &error_flag);
+ else if (!strcmp(key, "core.mainline"))
+ opts->mainline = git_config_int(key, value);
+ else if (!strcmp(key, "core.strategy"))
+ git_config_string(&opts->strategy, key, value);
+ else if (!strcmp(key, "core.strategy-option")) {
+ ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
+ opts->xopts[opts->xopts_nr++] = xstrdup(value);
+ } else
+ return error(_("Invalid key: %s"), key);
+
+ if (!error_flag)
+ return error(_("Invalid value for %s: %s"), key, value);
+
+ return 0;
+}
+
+static void MAYBE_UNUSED read_populate_opts(struct replay_opts **opts_ptr)
+{
+ const char *opts_file = git_path(SEQ_OPTS_FILE);
+
+ if (!file_exists(opts_file))
+ return;
+ if (git_config_from_file(populate_opts_cb, opts_file, *opts_ptr) < 0)
+ die(_("Malformed options sheet: %s"), opts_file);
+}
+
static void walk_revs_populate_todo(struct commit_list **todo_list,
struct replay_opts *opts)
{
@@ -774,6 +818,39 @@ static void save_todo(struct commit_list *todo_list, struct replay_opts *opts)
strbuf_release(&buf);
}
+static void save_opts(struct replay_opts *opts)
+{
+ const char *opts_file = git_path(SEQ_OPTS_FILE);
+ struct strbuf buf = STRBUF_INIT;
+ int i;
+
+ if (opts->no_commit)
+ git_config_set_in_file("core.no-commit", "true", opts_file);
+ if (opts->edit)
+ git_config_set_in_file("core.edit", "true", opts_file);
+ if (opts->signoff)
+ git_config_set_in_file("core.signoff", "true", opts_file);
+ if (opts->record_origin)
+ git_config_set_in_file("core.record-origin", "true", opts_file);
+ if (opts->allow_ff)
+ git_config_set_in_file("core.allow-ff", "true", opts_file);
+ if (opts->mainline) {
+ strbuf_reset(&buf);
+ strbuf_addf(&buf, "%d", opts->mainline);
+ git_config_set_in_file("core.mainline", buf.buf, opts_file);
+ }
+ if (opts->strategy)
+ git_config_set_in_file("core.strategy", opts->strategy, opts_file);
+ if (opts->xopts) {
+ for (i = 0; i < opts->xopts_nr; i ++)
+ git_config_set_multivar_in_file("core.strategy-option",
+ opts->xopts[i], "^$", 0,
+ opts_file);
+ }
+
+ strbuf_release(&buf);
+}
+
static int pick_commits(struct replay_opts *opts)
{
struct commit_list *todo_list = NULL;
@@ -796,6 +873,7 @@ static int pick_commits(struct replay_opts *opts)
return error(_("Can't cherry-pick into empty head"));
} else
save_head(sha1_to_hex(sha1));
+ save_opts(opts);
save_todo(todo_list, opts);
for (cur = todo_list; cur; cur = cur->next) {
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 64eaa20..79d868f 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -32,10 +32,36 @@ test_expect_success setup '
test_expect_success 'cherry-pick persists data on failure' '
pristine_detach initial &&
- test_must_fail git cherry-pick base..anotherpick &&
+ test_must_fail git cherry-pick -s base..anotherpick &&
test_path_is_dir .git/sequencer &&
test_path_is_file .git/sequencer/head &&
test_path_is_file .git/sequencer/todo &&
+ test_path_is_file .git/sequencer/opts &&
+ rm -rf .git/sequencer
+'
+
+test_expect_success 'cherry-pick persists opts correctly' '
+ pristine_detach initial &&
+ test_must_fail git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours base..anotherpick &&
+ test_path_is_dir .git/sequencer &&
+ test_path_is_file .git/sequencer/head &&
+ test_path_is_file .git/sequencer/todo &&
+ test_path_is_file .git/sequencer/opts &&
+ echo "true" >expect
+ git config --file=.git/sequencer/opts --get-all core.signoff >actual &&
+ test_cmp expect actual &&
+ echo "1" >expect
+ git config --file=.git/sequencer/opts --get-all core.mainline >actual &&
+ test_cmp expect actual &&
+ echo "recursive" >expect
+ git config --file=.git/sequencer/opts --get-all core.strategy >actual &&
+ test_cmp expect actual &&
+ cat >expect <<-\EOF
+ patience
+ ours
+ EOF
+ git config --file=.git/sequencer/opts --get-all core.strategy-option >actual &&
+ test_cmp expect actual &&
rm -rf .git/sequencer
'
--
1.7.4.rc1.7.g2cf08.dirty
next prev parent reply other threads:[~2011-07-19 17:19 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-19 17:17 [GSoC update] Sequencer for inclusion v2 Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-07-21 15:35 ` Phil Hord
2011-07-22 22:35 ` Jeff King
2011-07-24 10:23 ` Ramkumar Ramachandra
2011-07-24 18:15 ` Junio C Hamano
2011-07-25 21:17 ` Phil Hord
2011-07-19 17:17 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-07-19 19:55 ` Jeff King
2011-07-19 20:35 ` Jonathan Nieder
2011-07-19 21:26 ` Junio C Hamano
2011-07-19 21:57 ` Jeff King
2011-07-24 10:17 ` Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 03/18] revert: Simplify and inline add_message_to_msg Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 04/18] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 05/18] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 06/18] revert: Propogate errors upwards from do_pick_commit Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 07/18] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 08/18] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 09/18] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 10/18] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 11/18] revert: Save data for continuing after conflict resolution Ramkumar Ramachandra
2011-07-19 17:17 ` Ramkumar Ramachandra [this message]
2011-07-19 17:17 ` [PATCH 13/18] revert: Make pick_commits functionally act on a commit list Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 14/18] revert: Introduce --reset to remove sequencer state Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 15/18] reset: Make reset remove the " Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 16/18] revert: Remove sequencer state when no commits are pending Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 17/18] revert: Don't implictly stomp pending sequencer operation Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 18/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-07-19 18:47 ` [GSoC update] Sequencer for inclusion v2 Junio C Hamano
2011-07-20 9:02 ` Ramkumar Ramachandra
2011-07-19 23:54 ` Junio C Hamano
2011-07-24 10:11 ` Ramkumar Ramachandra
2011-07-24 18:17 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2011-07-27 3:18 [PATCH 00/18] GSoC update: Sequencer for inclusion v3 Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 12/18] revert: Save command-line options for continuing operation Ramkumar Ramachandra
2011-07-27 5:05 ` Jonathan Nieder
2011-07-27 9:51 ` Ramkumar Ramachandra
2011-07-27 14:21 ` Jonathan Nieder
2011-07-27 15:49 ` Ramkumar Ramachandra
2011-07-27 22:51 ` Junio C Hamano
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=1311095876-3098-13-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 \
--cc=peff@peff.net \
/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).