From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>, Paul Tan <pyokagan@gmail.com>
Subject: [PATCH/WIP v3 00/31] Make git-am a builtin
Date: Thu, 18 Jun 2015 19:25:12 +0800 [thread overview]
Message-ID: <1434626743-8552-1-git-send-email-pyokagan@gmail.com> (raw)
This patch series depends on pt/pull-builtin for OPT_PASSTHRU_ARGV() and
argv_array_pushv().
This is a re-roll of [WIP v3]. Thanks Junio and Stefan for the reviews last
round.
The biggest addition this round would be the support for git-rebase. Here's
a small unscientific benchmark that rebases 50 patches:
git init &&
echo initial >file &&
git add file &&
git commit -m initial &&
git tag initial &&
for x in $(seq 50)
do
echo $x >>file &&
git commit -a -m $x
done &&
git checkout -b onto-rebase initial &&
git commit --allow-empty -mempty &&
time git rebase -q --onto onto-rebase initial master
With master:
1.53s, 1.55s, 1.17s, 1.52s, 1.22s. Avg: ~1.40s
With master + this patch series:
0.22s, 0.22s, 0.18s, 0.21s, 0.18s. Avg: ~0.20s
So this is around a 6-7x speedup.
Previous versions:
[WIP v1] http://thread.gmane.org/gmane.comp.version-control.git/270048
[WIP v2] http://thread.gmane.org/gmane.comp.version-control.git/271381
git-am is a commonly used command for applying a series of patches from a
mailbox to the current branch. Currently, it is implemented by the shell script
git-am.sh. However, compared to C, shell scripts have certain deficiencies:
they need to spawn a lot of processes, introduce a lot of dependencies and
cannot take advantage of git's internal caches.
This WIP patch series rewrites git-am.sh into optimized C builtin/am.c, and is
part of my GSoC project to rewrite git-pull and git-am into C builtins[1].
[1] https://gist.github.com/pyokagan/1b7b0d1f4dab6ba3cef1
Paul Tan (31):
wrapper: implement xopen()
wrapper: implement xfopen()
am: implement skeletal builtin am
am: implement patch queue mechanism
am: split out mbox/maildir patches with git-mailsplit
am: detect mbox patches
am: extract patch, message and authorship with git-mailinfo
am: apply patch with git-apply
am: commit applied patch
am: refresh the index at start
am: refuse to apply patches if index is dirty
am: implement --resolved/--continue
am: implement --skip
am: implement --abort
am: don't accept patches when there's a session in progress
am: implement quiet option
am: exit with user friendly message on patch failure
am: implement am --signoff
cache-tree: introduce write_index_as_tree()
am: implement 3-way merge
am: --rebasing
am: don't use git-mailinfo if --rebasing
am: handle stray state directory
am: implement -k/--keep, --keep-non-patch
am: implement --[no-]message-id, am.messageid
am: support --keep-cr, am.keepcr
am: implement --[no-]scissors
am: pass git-apply's options to git-apply
am: implement --ignore-date
am: implement --committer-date-is-author-date
am: implement -S/--gpg-sign, commit.gpgsign
Makefile | 1 +
builtin.h | 1 +
builtin/am.c | 1650 +++++++++++++++++++++++++++++++++++++++++++++++++++++
cache-tree.c | 29 +-
cache-tree.h | 1 +
git-compat-util.h | 2 +
git.c | 1 +
wrapper.c | 43 ++
8 files changed, 1716 insertions(+), 12 deletions(-)
create mode 100644 builtin/am.c
--
2.1.4
next reply other threads:[~2015-06-18 11:26 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-18 11:25 Paul Tan [this message]
2015-06-18 11:25 ` [PATCH/WIP v3 01/31] wrapper: implement xopen() Paul Tan
2015-06-24 16:28 ` Johannes Schindelin
2015-06-24 16:59 ` Stefan Beller
2015-06-24 18:39 ` Johannes Schindelin
2015-07-01 9:41 ` Paul Tan
2015-07-01 9:53 ` Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 02/31] wrapper: implement xfopen() Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 03/31] am: implement skeletal builtin am Paul Tan
2015-06-18 20:26 ` Junio C Hamano
2015-06-19 9:56 ` Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 04/31] am: implement patch queue mechanism Paul Tan
2015-06-18 17:47 ` Stefan Beller
2015-06-18 20:43 ` Junio C Hamano
2015-06-19 12:49 ` Paul Tan
2015-06-24 14:59 ` Johannes Schindelin
2015-06-25 15:16 ` Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 05/31] am: split out mbox/maildir patches with git-mailsplit Paul Tan
2015-06-18 20:52 ` Junio C Hamano
2015-06-18 11:25 ` [PATCH/WIP v3 06/31] am: detect mbox patches Paul Tan
2015-06-18 21:02 ` Junio C Hamano
2015-06-24 8:41 ` Paul Tan
2015-06-24 15:10 ` Johannes Schindelin
2015-06-25 13:40 ` Paul Tan
2015-06-26 7:42 ` Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 07/31] am: extract patch, message and authorship with git-mailinfo Paul Tan
2015-06-18 21:10 ` Junio C Hamano
2015-06-19 9:22 ` Paul Tan
2015-06-19 16:13 ` Junio C Hamano
2015-06-24 7:54 ` Paul Tan
2015-06-24 15:59 ` Junio C Hamano
2015-06-25 11:54 ` Paul Tan
[not found] ` <CAPc5daVbpB_T4cY1xvLrBKPUZw0JNMXqNAOsKE-R7NPO2nrnZA@mail.gmail.com>
2015-06-19 16:15 ` Paul Tan
2015-06-19 20:12 ` Johannes Schindelin
2015-06-24 16:36 ` Johannes Schindelin
2015-06-26 8:11 ` Paul Tan
2015-06-26 20:41 ` Junio C Hamano
2015-06-18 11:25 ` [PATCH/WIP v3 08/31] am: apply patch with git-apply Paul Tan
2015-06-18 21:23 ` Junio C Hamano
2015-06-18 11:25 ` [PATCH/WIP v3 09/31] am: commit applied patch Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 10/31] am: refresh the index at start Paul Tan
2015-06-18 21:28 ` Junio C Hamano
2015-06-19 8:07 ` Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 11/31] am: refuse to apply patches if index is dirty Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 12/31] am: implement --resolved/--continue Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 13/31] am: implement --skip Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 14/31] am: implement --abort Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 15/31] am: don't accept patches when there's a session in progress Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 16/31] am: implement quiet option Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 17/31] am: exit with user friendly message on patch failure Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 18/31] am: implement am --signoff Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 19/31] cache-tree: introduce write_index_as_tree() Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 20/31] am: implement 3-way merge Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 21/31] am: --rebasing Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 22/31] am: don't use git-mailinfo if --rebasing Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 23/31] am: handle stray state directory Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 24/31] am: implement -k/--keep, --keep-non-patch Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 25/31] am: implement --[no-]message-id, am.messageid Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 26/31] am: support --keep-cr, am.keepcr Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 27/31] am: implement --[no-]scissors Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 28/31] am: pass git-apply's options to git-apply Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 29/31] am: implement --ignore-date Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 30/31] am: implement --committer-date-is-author-date Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 31/31] am: implement -S/--gpg-sign, commit.gpgsign Paul Tan
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=1434626743-8552-1-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.