1
0
mirror of https://github.com/git/git.git synced 2025-03-16 10:55:27 +00:00
Kirill Smelkov 8518ff8fab combine-diff: optimize combine_diff_path sets intersection
When generating combined diff, for each commit, we intersect diff
paths from diff(parent_0,commit) to diff(parent_i,commit) comparing
all paths pairs, i.e. doing it the quadratic way. That is correct,
but could be optimized.

Paths come from trees in sorted (= tree) order, and so does diff_tree()
emits resulting paths in that order too. Now if we look at diffcore
transformations, all of them, except diffcore_order, preserve resulting
path ordering:

    - skip_stat_unmatch, grep, pickaxe, filter
                            -- just skip elements -> order stays preserved

    - break                 -- just breaks diff for a path, adding path
                               dup after the path -> order stays preserved

    - detect rename/copy    -- resulting paths are emitted sorted
                               (verified empirically)

So only diffcore_order changes diff paths ordering.

But diffcore_order meaning affects only presentation - i.e. only how to
show the diff, so we could do all the internal computations without
paths reordering, and order only resultant paths set. This is faster,
since, if we know two paths sets are all ordered, their intersection
could be done in linear time.

This patch does just that.

Timings for `git log --raw --no-abbrev --no-renames` without `-c` ("git log")
and with `-c` ("git log -c") before and after the patch are as follows:

                linux.git v3.10..v3.11

            log     log -c

    before  1.9s    20.4s
    after   1.9s    16.6s

                navy.git    (private repo)

            log     log -c

    before  0.83s   15.6s
    after   0.83s    2.1s

P.S.

I think linux.git case is sped up not so much as the second one, since
in navy.git, there are more exotic (subtree, etc) merges.

P.P.S.

My tracing showed that the rest of the time (16.6s vs 1.9s) is usually
spent in computing huge diffs from commit to second parent. Will try to
deal with it, if I'll have time.

P.P.P.S.

For combine_diff_path, ->len is not needed anymore - will remove it in
the next noisy cleanup path, to maintain good signal/noise ratio here.

Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-02-24 14:44:57 -08:00
2014-01-27 10:45:49 -08:00
2014-01-27 10:44:59 -08:00
2014-01-27 11:01:35 -08:00
2014-01-21 13:16:17 -08:00
2013-12-12 14:18:34 -08:00
2014-01-10 10:32:18 -08:00
2013-11-12 13:32:11 -08:00
2013-06-10 10:55:42 -07:00
2014-01-17 12:21:20 -08:00
2013-12-17 12:02:44 -08:00
2014-01-17 12:21:20 -08:00
2013-12-09 14:54:48 -08:00
2014-01-17 12:21:20 -08:00
2013-07-22 16:06:49 -07:00
2014-01-10 10:33:09 -08:00
2014-01-10 10:33:09 -08:00
2013-09-09 14:36:15 -07:00
2014-01-27 10:45:03 -08:00
2013-09-11 15:03:28 -07:00
2014-01-17 12:21:20 -08:00
2013-07-19 09:26:15 -07:00
2014-01-17 12:21:20 -08:00
2013-11-12 09:24:27 -08:00
2014-01-10 10:33:14 -08:00
2013-10-29 12:41:17 -07:00
2014-01-31 14:16:06 -08:00
2014-01-17 12:21:20 -08:00
2013-12-17 12:02:44 -08:00
2013-12-05 12:58:59 -08:00
2013-07-22 16:06:49 -07:00
2014-01-10 10:32:39 -08:00
2013-07-29 12:32:25 -07:00
2013-10-23 13:21:31 -07:00
2013-10-23 13:21:31 -07:00
2014-01-10 10:33:09 -08:00
2014-01-13 11:33:35 -08:00
2014-01-10 10:31:48 -08:00
2013-07-30 08:13:38 -07:00
2013-07-30 08:13:38 -07:00
2013-11-01 07:38:58 -07:00
2014-01-13 11:28:26 -08:00
2014-01-17 12:21:20 -08:00
2014-01-17 12:21:20 -08:00
2013-09-09 14:36:15 -07:00
2013-07-15 10:56:07 -07:00
2013-09-09 14:36:15 -07:00
2013-12-05 12:59:09 -08:00
2013-10-31 13:48:26 -07:00
2014-01-17 12:21:20 -08:00
2014-01-17 12:21:20 -08:00
2014-01-27 10:44:59 -08:00
2013-06-20 16:02:18 -07:00
2014-01-17 12:21:20 -08:00
2013-09-17 11:37:33 -07:00
2013-09-17 11:37:33 -07:00
2014-01-17 12:21:20 -08:00
2013-11-12 09:24:27 -08:00

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public
License version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org (read
Documentation/SubmittingPatches for instructions on patch submission).
To subscribe to the list, send an email with just "subscribe git" in
the body to majordomo@vger.kernel.org. The mailing list archives are
available at http://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that
list the current status of various development topics to the mailing
list.  The discussion following them give a good reference for
project status, development direction and remaining tasks.
Description
Git Source Code Mirror - This is a publish-only repository but pull requests can be turned into patches to the mailing list via GitGitGadget (https://gitgitgadget.github.io/). Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Readme 661 MiB
Languages
C 50.1%
Shell 38.4%
Perl 5.1%
Tcl 3.3%
Python 0.8%
Other 2%