diff options
author | Kirill Smelkov <kirr@mns.spb.ru> | 2014-02-24 20:21:51 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-07 14:41:49 -0700 |
commit | 7195fbfaf5a539b8e8358097e02b63991e78a565 (patch) | |
tree | 5fb4ddafccf80986e24b40c29ebafefecf643d51 /compat/terminal.c | |
parent | tree-diff: rework diff_tree() to generate diffs for multiparent cases as well (diff) | |
download | tgif-7195fbfaf5a539b8e8358097e02b63991e78a565.tar.xz |
combine-diff: speed it up, by using multiparent diff tree-walker directly
As was recently shown in "combine-diff: optimize
combine_diff_path sets intersection", combine-diff runs very slowly. In
that commit we optimized paths sets intersection, but that accounted
only for ~ 25% of the slowness, and as my tracing showed, for linux.git
v3.10..v3.11, for merges a lot of time is spent computing
diff(commit,commit^2) just to only then intersect that huge diff to
almost small set of files from diff(commit,commit^1).
In previous commit, we described the problem in more details, and
reworked the diff tree-walker to be general one - i.e. to work in
multiple parent case too. Now is the time to take advantage of it for
finding paths for combine diff.
The implementation is straightforward - if we know, we can get generated
diff paths directly, and at present that means no diff filtering or
rename/copy detection was requested(*), we can call multiparent tree-walker
directly and get ready paths.
(*) because e.g. at present, all diffcore transformations work on
diff_filepair queues, but in the future, that limitation can be
lifted, if filters would operate directly on combine_diff_paths.
Timings for `git log --raw --no-abbrev --no-renames` without `-c` ("git log")
and with `-c` ("git log -c") and with `-c --merges` ("git log -c --merges")
before and after the patch are as follows:
linux.git v3.10..v3.11
log log -c log -c --merges
before 1.9s 16.4s 15.2s
after 1.9s 2.4s 1.1s
The result stayed the same.
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/terminal.c')
0 files changed, 0 insertions, 0 deletions