From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 09/11] revert: Write head, todo, done files
Date: Sun, 10 Apr 2011 20:41:55 +0530 [thread overview]
Message-ID: <1302448317-32387-10-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1302448317-32387-1-git-send-email-artagnon@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
builtin/revert.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 88 insertions(+), 6 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index e0352d4..25969a5 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -13,6 +13,7 @@
#include "rerere.h"
#include "merge-recursive.h"
#include "refs.h"
+#include "dir.h"
/*
* This implements the builtins revert and cherry-pick.
@@ -25,6 +26,13 @@
* Copyright (c) 2005 Junio C Hamano
*/
+#define SEQ_DIR "sequencer"
+
+#define SEQ_PATH git_path(SEQ_DIR)
+#define HEAD_FILE git_path(SEQ_DIR "/head")
+#define TODO_FILE git_path(SEQ_DIR "/todo")
+#define DONE_FILE git_path(SEQ_DIR "/done")
+
static const char * const revert_usage[] = {
"git revert [options] <commit-ish>",
NULL
@@ -643,21 +651,95 @@ static int read_and_refresh_cache(void)
return 0;
}
+static void format_todo(struct strbuf *buf, struct commit_list *list)
+{
+ struct commit_list *cur = NULL;
+ struct commit_message msg = { NULL, NULL, NULL, NULL, NULL };
+ const char *sha1 = NULL;
+ const char *action;
+
+ action = (cmd_opts.action == REVERT ? "revert" : "pick");
+ for (cur = list; cur; cur = cur->next) {
+ sha1 = find_unique_abbrev(cur->item->object.sha1, DEFAULT_ABBREV);
+ if (get_message(cur->item, cur->item->buffer, &msg))
+ die("Cannot get commit message for %s", sha1);
+
+ strbuf_addf(buf, "%s %s %s\n", action, sha1, msg.subject);
+ }
+}
+
+static int persist_initialize(unsigned char *head)
+{
+ struct strbuf buf = STRBUF_INIT;
+ int fd;
+
+ if (!file_exists(SEQ_PATH) && mkdir(SEQ_PATH, 0777))
+ return error_errno(_("Could not create sequencer directory '%s'"), SEQ_PATH);
+
+ if ((fd = open(HEAD_FILE, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0)
+ return error_errno(_("Could not open '%s' for writing"), HEAD_FILE);
+
+ strbuf_addf(&buf, "%s", find_unique_abbrev(head, DEFAULT_ABBREV));
+ write_or_whine(fd, buf.buf, buf.len, HEAD_FILE);
+ close(fd);
+ strbuf_release(&buf);
+ return 0;
+}
+
+static int persist_todo_done(int res, struct commit_list *todo_list,
+ struct commit_list *done_list)
+{
+ struct strbuf buf = STRBUF_INIT;
+ int fd;
+
+ if (!res)
+ return 0;
+
+ /* TODO file */
+ if ((fd = open(TODO_FILE, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0)
+ return error_errno(_("Could not open '%s' for writing"), TODO_FILE);
+
+ format_todo(&buf, todo_list);
+ write_or_whine(fd, buf.buf, buf.len, TODO_FILE);
+ close(fd);
+
+ /* DONE file */
+ strbuf_reset(&buf);
+ if ((fd = open(DONE_FILE, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0)
+ return error_errno(_("Could not open '%s' for writing"), DONE_FILE);
+
+ format_todo(&buf, done_list);
+ write_or_whine(fd, buf.buf, buf.len, DONE_FILE);
+ close(fd);
+ strbuf_release(&buf);
+ return res;
+}
+
static int pick_commits(void)
{
+ struct commit_list *done_list = NULL;
struct rev_info revs;
struct commit *commit;
+ unsigned char head[20];
int res;
+ if (get_sha1("HEAD", head))
+ return error(_("You do not have a valid HEAD"));
+
if ((res = read_and_refresh_cache()) ||
- (res = prepare_revs(&revs)))
+ (res = prepare_revs(&revs)) ||
+ (res = persist_initialize(head)))
return res;
- while ((commit = get_revision(&revs)) &&
- !(res = do_pick_commit(commit)))
- ;
-
- return res;
+ while ((commit = get_revision(&revs))) {
+ if (!(res = do_pick_commit(commit)))
+ commit_list_insert(commit, &done_list);
+ else {
+ commit_list_insert(commit, &revs.commits);
+ break;
+ }
+ }
+ return persist_todo_done(res, revs.commits, done_list);
}
int cmd_revert(int argc, const char **argv, const char *prefix)
--
1.7.4.rc1.7.g2cf08.dirty
next prev parent reply other threads:[~2011-04-10 15:14 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-10 15:11 [RFC PATCH 00/11] Sequencer Foundations Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 01/11] revert: Avoid calling die; return error instead Ramkumar Ramachandra
2011-04-10 19:14 ` Jonathan Nieder
2011-05-08 12:04 ` Ramkumar Ramachandra
2011-04-11 20:26 ` Junio C Hamano
2011-04-10 15:11 ` [PATCH 02/11] revert: Lose global variables "commit" and "me" Ramkumar Ramachandra
2011-04-11 3:24 ` Christian Couder
2011-04-11 8:57 ` Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 03/11] revert: Introduce a struct to parse command-line options into Ramkumar Ramachandra
2011-04-10 19:21 ` Jonathan Nieder
2011-05-08 12:18 ` Ramkumar Ramachandra
2011-04-11 21:41 ` Junio C Hamano
2011-05-08 12:09 ` Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 04/11] revert: Separate cmdline argument handling from the functional code Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 05/11] revert: Catch incompatible command-line options early Ramkumar Ramachandra
2011-04-11 21:44 ` Junio C Hamano
2011-05-08 11:47 ` Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 06/11] revert: Implement parsing --continue, --abort and --skip Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 07/11] revert: Handle conflict resolutions more elegantly Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 08/11] usage: Introduce error_errno correspoding to die_errno Ramkumar Ramachandra
2011-04-10 15:11 ` Ramkumar Ramachandra [this message]
2011-04-10 15:11 ` [PATCH 10/11] revert: Give noop a default value while argument parsing Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 11/11] revert: Implement --abort processing Ramkumar Ramachandra
2011-04-10 19:33 ` [RFC PATCH 00/11] Sequencer Foundations Daniel Barkalow
2011-04-11 8:55 ` Ramkumar Ramachandra
2011-04-10 19:47 ` Jonathan Nieder
2011-04-11 1:16 ` Daniel Barkalow
2011-04-11 6:42 ` Jonathan Nieder
2011-04-11 9:07 ` Ramkumar Ramachandra
2011-04-11 3:18 ` Christian Couder
2011-04-11 4:49 ` Ramkumar Ramachandra
2011-04-11 6:20 ` Christian Couder
2011-04-11 10:48 ` Ramkumar Ramachandra
2011-04-11 5:30 ` Daniel Barkalow
2011-04-11 5:38 ` Jonathan Nieder
2011-04-11 6:34 ` Daniel Barkalow
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=1302448317-32387-10-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--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).