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 11/18] revert: add get_todo_content() and create_todo_file()
Date: Thu, 25 Nov 2010 22:20:42 +0100 [thread overview]
Message-ID: <20101125212050.5188.30170.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20101125210138.5188.13115.chriscool@tuxfamily.org>
These static functions will make it possible to write "todo"
and "done" files. These files will list the actions (cherry
picks or reverts) that are still to be completed and that
have already been done respectively.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/revert.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 8b50e0c..7429be2 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -177,6 +177,69 @@ static char *get_encoding(const char *message, const unsigned char *sha1)
return NULL;
}
+static void get_todo_content(struct strbuf *buf, struct commit_list *list,
+ const char *line_prefix, struct args_info *info)
+{
+ struct commit_list *cur = list;
+ struct strbuf cmd = STRBUF_INIT;
+
+ if (line_prefix)
+ strbuf_addstr(&cmd, line_prefix);
+ strbuf_addstr(&cmd, info->action == REVERT ? "revert " : "pick ");
+ if (info->no_commit)
+ strbuf_addstr(&cmd, "-n ");
+ if (info->edit)
+ strbuf_addstr(&cmd, "-e ");
+ if (info->signoff)
+ strbuf_addstr(&cmd, "-s ");
+ if (info->mainline)
+ strbuf_addf(&cmd, "-m %d ", info->mainline);
+ if (info->allow_rerere_auto)
+ strbuf_addstr(&cmd, "--rerere-autoupdate ");
+ if (info->strategy)
+ strbuf_addf(&cmd, "--strategy %s ", info->strategy);
+ if (info->no_replay)
+ strbuf_addstr(&cmd, "-x ");
+ if (info->allow_ff)
+ strbuf_addstr(&cmd, "--ff ");
+
+ for (; cur; cur = cur->next) {
+ struct commit_message msg = { NULL, NULL, NULL, NULL, NULL };
+ const unsigned char *sha1 = cur->item->object.sha1;
+ if (get_message(cur->item->buffer, sha1, &msg) != 0)
+ die("Cannot get commit message for %s",
+ sha1_to_hex(sha1));
+ strbuf_addbuf(buf, &cmd);
+ strbuf_addf(buf, " %s # %s\n",
+ find_unique_abbrev(sha1, DEFAULT_ABBREV),
+ msg.subject);
+ free_message(&msg);
+ }
+
+ strbuf_release(&cmd);
+}
+
+static void create_todo_file(const char *filepath, int append,
+ struct commit_list *list, const char *line_prefix,
+ struct args_info *info)
+{
+ int fd, flags;
+ struct strbuf buf = STRBUF_INIT;
+
+ get_todo_content(&buf, list, line_prefix, info);
+
+ flags = O_WRONLY | O_CREAT | (append ? O_APPEND : O_TRUNC);
+ fd = open(filepath, flags, 0666);
+ if (fd < 0)
+ die_errno("Could not open file '%s' for writing", filepath);
+
+ write_or_whine(fd, buf.buf, buf.len, filepath);
+
+ close(fd);
+
+ strbuf_release(&buf);
+}
+
static void add_message_to_msg(struct strbuf *msgbuf, const char *message,
const unsigned char *sha1)
{
--
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 ` Christian Couder [this message]
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 ` [RFC/PATCH 16/18] revert: implement parsing TODO and DONE files Christian Couder
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.30170.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).