From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [RFC PATCH 0/9] Improve rename detection performance in merge recursive
Date: Fri, 10 Nov 2017 14:21:47 -0800 [thread overview]
Message-ID: <20171110222156.23221-1-newren@gmail.com> (raw)
This series depends on BOTH my rename-limits and directory-detection
series
(https://public-inbox.org/git/20171110173956.25105-1-newren@gmail.com/
and
https://public-inbox.org/git/20171110190550.27059-1-newren@gmail.com/).
This series could be modified to be submitted with no dependencies on
those series, but it'd end up causing lots of merging conflicts, and
having this series depend on the other two seemed most logical to me.
This patch series tries to improve performance rename detection
performance in merge recursive where possible. In particular, I was
guided by a specific usecase of cherry-picking a small change (by
which I mean 7 files with small modifications and one new file) in a
repo that has thousands of renames, due to some high-level directories
having been renamed. Some of the changes should help rename detection
performance in general, but the greatest benefit will be found when
one side of history only makes a small number of changes. For my
usecase, I dropped the time needed for the cherry-pick from over 9
minutes, down to about 16 seconds.
RFC because:
* I believe the patch with the biggest performance improvement will
break directory rename detection in specific, limited cases (which
are not yet represented in the testsuite). Should be fixable; I
just need to implement the fix. (The fix may reduce the
performance improvement slightly).
* This series includes changes to conflict handling for conflict
types that involve two colliding files. I think the new behavior
is strictly better, but this is the kind of thing I really need to
make sure others agree with; comments very welcome. (Patches 2--6)
* 16 seconds is still annoyingly slow; we should be able to do better.
I have one or two ideas. But since others are asking about the
performance of small cherry-picks in large repos with lots of renames,
I figure it's worth posting what I have so far.
Elijah Newren (9):
diffcore-rename: No point trying to find a match better than exact
merge-recursive: Avoid unnecessary string list lookups
merge-recursive: New function for better colliding conflict
resolutions
Add testcases for improved file collision conflict handling
merge-recursive: Fix rename/add conflict handling
merge-recursive: Improve handling for rename/rename(2to1) conflicts
merge-recursive: Improve handling for add/add conflicts
merge-recursive: Accelerate rename detection
diffcore-rename: Filter rename_src list when possible
diff.c | 1 +
diff.h | 7 +
diffcore-rename.c | 85 ++++++-
merge-recursive.c | 452 ++++++++++++++++++++++++-----------
t/t2023-checkout-m.sh | 2 +-
t/t3418-rebase-continue.sh | 27 ++-
t/t3504-cherry-pick-rerere.sh | 19 +-
t/t4200-rerere.sh | 12 +-
t/t6020-merge-df.sh | 4 +-
t/t6024-recursive-merge.sh | 35 +--
t/t6025-merge-symlinks.sh | 9 +-
t/t6031-merge-filemode.sh | 4 +-
t/t6036-recursive-corner-cases.sh | 19 +-
t/t6042-merge-rename-corner-cases.sh | 212 +++++++++++++++-
t/t6043-merge-rename-directories.sh | 13 +-
t/t7060-wtstatus.sh | 1 +
t/t7064-wtstatus-pv2.sh | 4 +-
t/t7506-status-submodule.sh | 11 +-
t/t7610-mergetool.sh | 28 +--
19 files changed, 722 insertions(+), 223 deletions(-)
--
2.15.0.46.g41dca04efb
next reply other threads:[~2017-11-10 22:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 22:21 Elijah Newren [this message]
2017-11-10 22:21 ` [RFC PATCH 1/9] diffcore-rename: No point trying to find a match better than exact Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 2/9] merge-recursive: Avoid unnecessary string list lookups Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 3/9] merge-recursive: New function for better colliding conflict resolutions Elijah Newren
2017-11-11 16:49 ` Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 4/9] Add testcases for improved file collision conflict handling Elijah Newren
2017-11-11 16:52 ` Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 5/9] merge-recursive: Fix rename/add " Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 6/9] merge-recursive: Improve handling for rename/rename(2to1) conflicts Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 7/9] merge-recursive: Improve handling for add/add conflicts Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 8/9] merge-recursive: Accelerate rename detection Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 9/9] diffcore-rename: Filter rename_src list when possible Elijah Newren
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=20171110222156.23221-1-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
/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).