From: Christian Couder <chriscool@tuxfamily.org>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [RFC/PATCH 16/18] revert: implement parsing TODO and DONE files
Date: Thu, 25 Nov 2010 22:20:47 +0100 [thread overview]
Message-ID: <20101125212050.5188.64875.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20101125210138.5188.13115.chriscool@tuxfamily.org>
From: Stephan Beyer <s-beyer@gmx.net>
The code from this patch comes from the git sequencer Google
Summer of Code 2008 project available here:
http://repo.or.cz/w/git/sbeyer.git
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/revert.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 228 insertions(+), 0 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index fee2e38..ca65b92 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -70,6 +70,234 @@ static const char * const *revert_or_cherry_pick_usage(struct args_info *info)
return info->action == REVERT ? revert_usage : cherry_pick_usage;
}
+/*
+ * A structure for a parsed instruction line plus a next pointer
+ * to allow linked list behavior
+ */
+struct parsed_insn {
+ int argc;
+ const char **argv;
+ int line;
+ struct strbuf orig;
+ struct parsed_insn *next;
+};
+
+struct parsed_file {
+ size_t count;
+ size_t total;
+ struct parsed_insn *first;
+ struct parsed_insn *last;
+ struct parsed_insn *cur; /* a versatile helper */
+};
+
+static int parse_line(char *buf, size_t len, int lineno,
+ struct parsed_insn **line)
+{
+ static int alloc = 0;
+ static struct strbuf arg_sb = STRBUF_INIT;
+ static enum {
+ ST_START,
+ ST_DELIMITER,
+ ST_ARGUMENT,
+ ST_ESCAPE,
+ ST_DOUBLE_QUOTES,
+ ST_DOUBLE_QUOTES_ESCAPE,
+ ST_SINGLE_QUOTES,
+ } state = ST_START;
+ /* The current rules are as follows:
+ * 1. whitespace at the beginning is ignored
+ * 2. insn is everything up to next whitespace or EOL
+ * 3. now whitespace acts as delimiter for arguments,
+ * except if written in single or double quotes
+ * 4. \ acts as escape inside and outside double quotes.
+ * Inside double quotes, this is only useful for \".
+ * Outside, it is useful for \', \", \\ and \ .
+ * 5. single quotes do not have an escape character
+ * 6. abort on "#" (comments)
+ */
+
+ size_t i, j = 0;
+ struct parsed_insn *ret = *line;
+
+ for (i = 0; i <= len; ++i) {
+ switch (state) {
+ case ST_START:
+ switch (buf[i]) {
+ case ' ':
+ case '\t':
+ continue;
+ case 0:
+ case '#':
+ break;
+ case '\'':
+ j = i+1;
+ state = ST_SINGLE_QUOTES;
+ break;
+ case '"':
+ j = i+1;
+ state = ST_DOUBLE_QUOTES;
+ break;
+ default:
+ j = i;
+ state = ST_ARGUMENT;
+ break;
+ }
+ /* prepare everything */
+ ret = xcalloc(1, sizeof(*ret));
+ ret->line = lineno;
+ strbuf_init(&ret->orig, len+2);
+ if (!buf[i] || buf[i] == '#') /* empty/comment */
+ goto finish;
+ break;
+ case ST_DELIMITER:
+ switch (buf[i]) {
+ case ' ':
+ case '\t':
+ continue;
+ case 0:
+ break;
+ case '\'':
+ j = i+1;
+ state = ST_SINGLE_QUOTES;
+ break;
+ case '"':
+ j = i+1;
+ state = ST_DOUBLE_QUOTES;
+ break;
+ default:
+ j = i;
+ state = ST_ARGUMENT;
+ if (buf[i] == '#') /* a comment */
+ goto finish;
+ break;
+ }
+ /* prepare next argument */
+ ALLOC_GROW(ret->argv, ret->argc + 1, alloc);
+ ret->argv[ret->argc++] = strbuf_detach(&arg_sb, NULL);
+ break;
+ case ST_ARGUMENT:
+ switch (buf[i]) {
+ case ' ':
+ case '\t':
+ strbuf_add(&arg_sb, buf+j, i-j);
+ state = ST_DELIMITER;
+ break;
+ case '"':
+ strbuf_add(&arg_sb, buf+j, i-j);
+ j = i + 1;
+ state = ST_DOUBLE_QUOTES;
+ break;
+ case '\'':
+ strbuf_add(&arg_sb, buf+j, i-j);
+ j = i + 1;
+ state = ST_SINGLE_QUOTES;
+ break;
+ case '\\':
+ strbuf_add(&arg_sb, buf+j, i-j);
+ j = i + 1;
+ state = ST_ESCAPE;
+ default:
+ break;
+ }
+ break;
+ case ST_ESCAPE:
+ state = ST_ARGUMENT;
+ break;
+ case ST_DOUBLE_QUOTES:
+ switch (buf[i]) {
+ case '"':
+ strbuf_add(&arg_sb, buf+j, i-j);
+ j = i + 1;
+ state = ST_ARGUMENT;
+ break;
+ case '\\':
+ strbuf_add(&arg_sb, buf+j, i-j);
+ j = i + 1;
+ state = ST_DOUBLE_QUOTES_ESCAPE;
+ break;
+ default:
+ break;
+ }
+ break;
+ case ST_DOUBLE_QUOTES_ESCAPE:
+ state = ST_DOUBLE_QUOTES;
+ break;
+ case ST_SINGLE_QUOTES:
+ switch (buf[i]) {
+ case '\'':
+ strbuf_add(&arg_sb, buf+j, i-j);
+ j = i + 1;
+ state = ST_ARGUMENT;
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ }
+finish:
+ *line = ret;
+ switch(state) {
+ case ST_DOUBLE_QUOTES:
+ case ST_DOUBLE_QUOTES_ESCAPE:
+ case ST_SINGLE_QUOTES:
+ strbuf_add(&arg_sb, buf+j, i-j-1);
+ strbuf_add(&arg_sb, "\n", 1);
+ return 1;
+ case ST_ARGUMENT:
+ if (i-j > 1)
+ strbuf_add(&arg_sb, buf+j, i-j-1);
+ ALLOC_GROW(ret->argv, ret->argc + 1, alloc);
+ ret->argv[ret->argc++] = strbuf_detach(&arg_sb, NULL);
+ case ST_DELIMITER:
+ state = ST_START;
+ alloc = 0;
+ default:
+ strbuf_addstr(&ret->orig, buf);
+ strbuf_addch(&ret->orig, '\n');
+ return 0;
+ }
+}
+
+static void add_parsed_line_to_parsed_file(struct parsed_insn *parsed_line,
+ struct parsed_file *contents)
+{
+ if (!contents->first) {
+ contents->first = parsed_line;
+ contents->last = parsed_line;
+ } else {
+ contents->last->next = parsed_line;
+ contents->last = parsed_line;
+ }
+ if (parsed_line->argv)
+ contents->total++;
+}
+
+/* Parse a file fp; write result into contents */
+static void parse_file(const char *filename, struct parsed_file *contents)
+{
+ struct strbuf str = STRBUF_INIT;
+ struct parsed_insn *parsed_line = NULL;
+ int r = 0;
+ int lineno = 0;
+ FILE *fp = fp = fopen(filename, "r");
+ if (!fp)
+ die_errno("Could not open file '%s'", filename);
+
+ memset(contents, 0, sizeof(*contents));
+
+ while (strbuf_getline(&str, fp, '\n') != EOF) {
+ lineno++;
+ r = parse_line(str.buf, str.len, lineno, &parsed_line);
+ if (!r)
+ add_parsed_line_to_parsed_file(parsed_line, contents);
+ }
+ strbuf_release(&str);
+ fclose(fp);
+ if (r)
+ die("Unexpected end of file.");
+}
+
static void parse_args(int argc, const char **argv, struct args_info *info)
{
int noop;
--
1.7.3.2.504.g59d466
next prev parent reply other threads:[~2010-11-26 5:56 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-25 21:20 [RFC/PATCH 00/18] WIP implement cherry-pick/revert --continue Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 01/18] advice: add error_resolve_conflict() function Christian Couder
2010-11-26 5:56 ` Jonathan Nieder
2010-11-25 21:20 ` [RFC/PATCH 02/18] revert: change many die() calls into "return error()" calls Christian Couder
2010-11-26 6:05 ` Jonathan Nieder
2010-11-25 21:20 ` [RFC/PATCH 03/18] usage: implement error_errno() the same way as die_errno() Christian Couder
2010-11-26 6:07 ` Jonathan Nieder
2010-11-26 18:35 ` Junio C Hamano
2010-11-25 21:20 ` [RFC/PATCH 04/18] revert: don't die when write_message() fails Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 05/18] commit: move reverse_commit_list() into commit.{h, c} Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 06/18] revert: remove "commit" global variable Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 07/18] revert: put option information in an option struct Christian Couder
2010-11-26 6:18 ` Jonathan Nieder
2010-11-26 18:42 ` Junio C Hamano
2010-11-25 21:20 ` [RFC/PATCH 08/18] revert: refactor code into a new pick_commits() function Christian Couder
2010-11-27 3:50 ` Daniel Barkalow
2010-11-25 21:20 ` [RFC/PATCH 09/18] revert: make pick_commits() return an error on --ff incompatible option Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 10/18] revert: make read_and_refresh_cache() and prepare_revs() return errors Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 11/18] revert: add get_todo_content() and create_todo_file() Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 12/18] revert: write TODO and DONE files in case of failure Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 13/18] revert: add option parsing for option --continue Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 14/18] revert: move global variable "me" into "struct args_info" Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 15/18] revert: add NONE action and make parse_args() manage it Christian Couder
2010-11-25 21:20 ` Christian Couder [this message]
2010-11-25 21:20 ` [RFC/PATCH 17/18] revert: add remaining instructions in todo file Christian Couder
2010-11-25 21:20 ` [RFC/PATCH 18/18] revert: implement --continue processing Christian Couder
2010-11-26 6:28 ` [RFC/PATCH 00/18] WIP implement cherry-pick/revert --continue 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101125212050.5188.64875.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=s-beyer@gmx.net \
--cc=torvalds@linux-foundation.org \
/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.
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 NNTP newsgroup(s).