git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 17/18] revert: add remaining instructions in todo file
Date: Thu, 25 Nov 2010 22:20:48 +0100	[thread overview]
Message-ID: <20101125212050.5188.28783.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20101125210138.5188.13115.chriscool@tuxfamily.org>


Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 builtin/revert.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/builtin/revert.c b/builtin/revert.c
index ca65b92..b51f7ab 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -483,14 +483,19 @@ static void get_todo_content(struct strbuf *buf, struct commit_list *list,
 }
 
 static void create_todo_file(const char *filepath, int append,
-			     struct commit_list *list, const char *line_prefix,
-			     struct args_info *info)
+			     struct commit_list *list, struct parsed_insn *insn,
+			     const char *line_prefix, struct args_info *info)
 {
 	int fd, flags;
 	struct strbuf buf = STRBUF_INIT;
 
 	get_todo_content(&buf, list, line_prefix, info);
 
+	if (insn) {
+		while ((insn = insn->next))
+			strbuf_addbuf(&buf, &insn->orig);
+	}
+
 	flags = O_WRONLY | O_CREAT | (append ? O_APPEND : O_TRUNC);
 	fd = open(filepath, flags, 0666);
 	if (fd < 0)
@@ -926,9 +931,9 @@ static int save_todo_and_done(int res, struct args_info *infos,
 				  SEQ_PATH);
 		if (commit)
 			commit_list_insert(commit, &todo_list);
-		create_todo_file(TODO_FILE, 0, todo_list, "", infos);
+		create_todo_file(TODO_FILE, 0, todo_list, NULL, "", infos);
 		*done_list = reverse_commit_list(*done_list);
-		create_todo_file(DONE_FILE, 0, *done_list, "", infos);
+		create_todo_file(DONE_FILE, 0, *done_list, NULL, "", infos);
 	}
 	return res;
 }
-- 
1.7.3.2.504.g59d466

  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 ` [RFC/PATCH 16/18] revert: implement parsing TODO and DONE files Christian Couder
2010-11-25 21:20 ` Christian Couder [this message]
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.28783.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).