From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>,
Jonathan Nieder <jrnieder@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Jeff King <peff@peff.net>
Subject: [PATCH v5 00/18] Sequencer for inclusion
Date: Mon, 1 Aug 2011 23:36:47 +0530 [thread overview]
Message-ID: <1312222025-28453-1-git-send-email-artagnon@gmail.com> (raw)
Hi,
This is yet another iteration, with few improvements since last time.
Some minor nits pointed out by Jonathan and Christian are now fixed.
One additional detail: while playing with my generalized sequencer, I
noticed a couple of embarrassing bugs in the tests -- "malformed
instruction sheet 1" and "malformed instruction sheet 2" were picking
"base..picked" instead of "base..anotherpick". Fixed now.
Thanks.
-- Ram
Ramkumar Ramachandra (18):
advice: Introduce error_resolve_conflict
config: Introduce functions to write non-standard file
revert: Simplify and inline add_message_to_msg
revert: Don't check lone argument in get_encoding
revert: Rename no_replay to record_origin
revert: Eliminate global "commit" variable
revert: Introduce struct to keep command-line options
revert: Separate cmdline parsing from functional code
revert: Don't create invalid replay_opts in parse_args
revert: Save data for continuing after conflict resolution
revert: Save command-line options for continuing operation
revert: Make pick_commits functionally act on a commit list
revert: Introduce --reset to remove sequencer state
reset: Make reset remove the sequencer state
revert: Remove sequencer state when no commits are pending
revert: Don't implicitly stomp pending sequencer operation
revert: Introduce --continue to continue the operation
revert: Propagate errors upwards from do_pick_commit
Documentation/git-cherry-pick.txt | 6 +
Documentation/git-revert.txt | 6 +
Documentation/sequencer.txt | 9 +
Makefile | 2 +
advice.c | 31 ++-
advice.h | 3 +-
branch.c | 2 +
builtin/revert.c | 735 +++++++++++++++++++++++++++++--------
cache.h | 2 +
config.c | 36 ++-
sequencer.c | 19 +
sequencer.h | 20 +
t/7106-reset-sequence.sh | 44 +++
t/t3510-cherry-pick-sequence.sh | 214 +++++++++++
14 files changed, 958 insertions(+), 171 deletions(-)
create mode 100644 Documentation/sequencer.txt
create mode 100644 sequencer.c
create mode 100644 sequencer.h
create mode 100755 t/7106-reset-sequence.sh
create mode 100755 t/t3510-cherry-pick-sequence.sh
--
1.7.4.rc1.7.g2cf08.dirty
next reply other threads:[~2011-08-01 18:10 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-01 18:06 Ramkumar Ramachandra [this message]
2011-08-01 18:06 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 03/18] revert: Simplify and inline add_message_to_msg Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 04/18] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 05/18] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 06/18] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 07/18] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 08/18] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 09/18] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-08-02 6:28 ` Christian Couder
2011-08-02 6:41 ` Christian Couder
2011-08-04 9:34 ` Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 10/18] revert: Save data for continuing after conflict resolution Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 11/18] revert: Save command-line options for continuing operation Ramkumar Ramachandra
2011-08-04 4:05 ` Christian Couder
2011-08-04 9:25 ` Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 12/18] revert: Make pick_commits functionally act on a commit list Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 13/18] revert: Introduce --reset to remove sequencer state Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 14/18] reset: Make reset remove the " Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 15/18] revert: Remove sequencer state when no commits are pending Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 16/18] revert: Don't implicitly stomp pending sequencer operation Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 17/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-08-01 18:31 ` Ramkumar Ramachandra
2011-08-02 2:36 ` Christian Couder
2011-08-02 2:47 ` Christian Couder
2011-08-02 2:51 ` Christian Couder
2011-08-02 4:41 ` Ramkumar Ramachandra
2011-08-04 10:02 ` Ramkumar Ramachandra
2011-08-02 6:24 ` Christian Couder
2011-08-04 4:57 ` Christian Couder
2011-08-04 9:22 ` Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 18/18] revert: Propagate errors upwards from do_pick_commit Ramkumar Ramachandra
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=1312222025-28453-1-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 \
--cc=peff@peff.net \
/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).