All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kirill Smelkov <kirr@mns.spb.ru>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Kirill Smelkov <kirr@mns.spb.ru>
Subject: [PATCH 0/2] Multiparent diff tree-walker + combine-diff speedup
Date: Thu, 13 Feb 2014 18:02:53 +0400	[thread overview]
Message-ID: <cover.1392299516.git.kirr@mns.spb.ru> (raw)

Here go combine-diff speedup patches in form of first reworking diff
tree-walker to work in general case - when a commit have several parents, not
only one - we are traversing all 1+nparent trees in parallel.

Then we are taking advantage of the new diff tree-walker for speeding up
combine-diff, which for linux.git results in ~14 times speedup.

I understand v1.9.0 is going to be released first, but wanted to finally send
the patches, so that people could start reviewing them.

Please apply on top of ks/tree-diff-more and thanks beforehand,

Kirill



Kirill Smelkov (2):
  tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
  combine-diff: speed it up, by using multiparent diff tree-walker directly

 combine-diff.c |  85 +++++++++-
 diff.c         |   2 +
 diff.h         |  10 ++
 tree-diff.c    | 501 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 4 files changed, 529 insertions(+), 69 deletions(-)

-- 
1.9.rc1.181.g641f458

             reply	other threads:[~2014-02-13 14:01 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-13 14:02 Kirill Smelkov [this message]
2014-02-13 14:02 ` [PATCH 1/2] tree-diff: rework diff_tree() to generate diffs for multiparent cases as well Kirill Smelkov
2014-02-13 19:51   ` Junio C Hamano
2014-02-14 12:15     ` Kirill Smelkov
2014-02-14 17:37       ` Junio C Hamano
2014-02-16  8:08         ` Kirill Smelkov
2014-02-18 21:29           ` Junio C Hamano
2014-02-13 14:02 ` [PATCH 2/2] combine-diff: speed it up, by using multiparent diff tree-walker directly Kirill Smelkov
2014-02-13 19:55   ` Junio C Hamano
2014-02-14 12:16     ` Kirill Smelkov

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=cover.1392299516.git.kirr@mns.spb.ru \
    --to=kirr@mns.spb.ru \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.