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: [RFC PATCH 14/14] revert: Change insn sheet format
Date: Wed, 6 Jul 2011 07:54:28 +0000 [thread overview]
Message-ID: <1309938868-2028-15-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1309938868-2028-1-git-send-email-artagnon@gmail.com>
Add command-line options to the instruction sheet, but don't let the
existing parser break. Parsing out the command-line options back into
a replay_opts struct is unimplemented.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
I've intentionally left parse_cmdline_args unimplemented -- Although
Stephen (and Christian subsequently) have written a parser [1], I'm
not happy with it. The point of this patch is to illustrate the
problem with this instruction sheet format, and provoke some
discussion about this. I don't want to parse command-line arguments
by hand handling all sorts of corner cases in quoting etc -- is there
any other way? Existing implementations in libraries like Glib are
much too heavyweight.
Note that I've used the '#' character as a separator to simplify
parsing. It's not the most elegant solution, but I think it should
work.
[1]: http://article.gmane.org/gmane.comp.version-control.git/162198
builtin/revert.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 6ef56ee..a0a4377 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -638,6 +638,34 @@ static void read_and_refresh_cache(const char *me, struct replay_opts *opts)
rollback_lock_file(&index_lock);
}
+static void format_args(struct strbuf *buf, struct replay_opts *opts)
+{
+ int i;
+
+ if (opts->no_commit)
+ strbuf_addstr(buf, "-n ");
+ if (opts->edit)
+ strbuf_addstr(buf, "-e ");
+ if (opts->signoff)
+ strbuf_addstr(buf, "-s ");
+ if (opts->mainline)
+ strbuf_addf(buf, "-m %d ", opts->mainline);
+ if (opts->strategy)
+ strbuf_addf(buf, "--strategy %s ", opts->strategy);
+ if (opts->xopts)
+ for (i = 0; i < opts->xopts_nr; i ++)
+ strbuf_addf(buf, "-X %s ", opts->xopts[i]);
+ if (opts->record_origin)
+ strbuf_addstr(buf, "-x ");
+ if (opts->allow_ff)
+ strbuf_addstr(buf, "--ff ");
+}
+
+/*
+ * Instruction sheet format ::
+ * pick -s 537d2e # revert: Introduce --continue to continue the operation
+ * pick 4a15c1 # revert: Introduce --reset to cleanup sequencer data
+ */
static void format_todo(struct strbuf *buf, struct commit_list *todo_list,
struct replay_opts *opts)
{
@@ -651,29 +679,53 @@ static void format_todo(struct strbuf *buf, struct commit_list *todo_list,
sha1_abbrev = find_unique_abbrev(cur->item->object.sha1, DEFAULT_ABBREV);
if (get_message(cur->item, &msg))
die(_("Cannot get commit message for %s"), sha1_abbrev);
- strbuf_addf(buf, "%s %s %s\n", action, sha1_abbrev, msg.subject);
+ strbuf_addf(buf, "%s ", action);
+ format_args(buf, opts);
+ strbuf_addf(buf, "%s # %s\n", sha1_abbrev, msg.subject);
}
}
-static struct commit *parse_insn_line(char *start, struct replay_opts *opts)
+static void parse_cmdline_args(struct strbuf *args_to_parse,
+ int *argc, const char ***argv)
+{
+ return;
+}
+
+static struct commit *parse_insn_line(const char *start, struct replay_opts *opts)
{
unsigned char commit_sha1[20];
char sha1_abbrev[40];
struct commit *commit;
enum replay_action action;
int insn_len = 0;
- char *p;
+ char *p, *end;
+
+ int argc = 0;
+ const char **argv = NULL;
+ struct strbuf args_to_parse = STRBUF_INIT;
- p = start;
+ p = (char *) start;
if (!(p = strchr(p, ' ')))
return NULL;
insn_len = p - start;
- if (!(p = strchr(p + 1, ' ')))
+ if (!(end = strchr(p + 1, '#')))
return NULL;
- p += 1;
- strlcpy(sha1_abbrev, start + insn_len + 1,
- p - (start + insn_len + 1));
+ *(end - 1) = '\0';
+ strbuf_addstr(&args_to_parse, p + 1);
+
+ /* Parse argc, argv out of args_to_parse */
+ /* TODO: Implement parse_cmdline_args! */
+ parse_cmdline_args(&args_to_parse, &argc, &argv);
+ strbuf_release(&args_to_parse);
+ if (argc)
+ parse_args(argc, argv, opts);
+
+ /* Copy out the sha1_abbrev explicitly */
+ if (!(p = strrchr(p, ' ')))
+ return NULL;
+ strcpy(sha1_abbrev, p + 1);
+ /* Determine the action */
if (!strncmp(start, "pick", insn_len))
action = CHERRY_PICK;
else if (!strncmp(start, "revert", insn_len))
@@ -718,7 +770,7 @@ static void read_populate_todo(struct commit_list **todo_list,
close(fd);
next = todo_list;
- for (p = buf.buf; *p; p = strchr(p, '\n') + 1) {
+ for (p = buf.buf; *p;) {
if (!(commit = parse_insn_line(p, opts))) {
strbuf_release(&buf);
die(_("Malformed instruction sheet: %s"), git_path(SEQ_TODO_FILE));
@@ -727,6 +779,11 @@ static void read_populate_todo(struct commit_list **todo_list,
new->item = commit;
*next = new;
next = &new->next;
+
+ if ((p = strchr(p, '\n')))
+ p += 1;
+ else
+ break;
}
*next = NULL;
strbuf_release(&buf);
--
1.7.5.GIT
next prev parent reply other threads:[~2011-07-06 7:55 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 ` [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 ` Ramkumar Ramachandra [this message]
2011-07-06 10:33 ` [RFC PATCH 14/14] revert: Change insn sheet format 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-15-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).