From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [RFC PATCH v2 0/9] Improve merge recursive performance
Date: Mon, 20 Nov 2017 14:19:35 -0800 [thread overview]
Message-ID: <20171120221944.15431-1-newren@gmail.com> (raw)
You probably want to wait to review this series until my rename detection
series lands so that I can clean up any more conflicts, but I'm posting
this new series in case anyone wants to take an early look. It includes
fixes identified by the reviews of my other patch series, and has been
rebased on top of newer versions with conflicts resolved.
For the adventerous, though...
This patch series improves merge recursive performance, particularly when
one side of history only makes a small number of changes, and the other has
lots of renames (or lots of adds and deletes); I saw a speedup factor of
over 30 on one particular real world repository.
Still RFC for the same reasons that the first series was (see
https://public-inbox.org/git/20171110222156.23221-1-newren@gmail.com/), I
haven't yet had time to push this further other than rebasing and cleaning
up issues shared with my other series.
If you just want to test it out, it's available as the
'big-repo-small-cherry-pick' branch of https://github.com/newren/git .
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 | 15 +-
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, 723 insertions(+), 224 deletions(-)
--
2.15.0.323.g31fe956618
next reply other threads:[~2017-11-20 22:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 22:19 Elijah Newren [this message]
2017-11-20 22:19 ` [RFC PATCH v2 1/9] diffcore-rename: no point trying to find a match better than exact Elijah Newren
2017-11-20 22:19 ` [RFC PATCH v2 2/9] merge-recursive: avoid unnecessary string list lookups Elijah Newren
2017-11-20 22:19 ` [RFC PATCH v2 3/9] merge-recursive: new function for better colliding conflict resolutions Elijah Newren
2017-11-20 22:19 ` [RFC PATCH v2 4/9] Add testcases for improved file collision conflict handling Elijah Newren
2017-11-20 22:19 ` [RFC PATCH v2 5/9] merge-recursive: fix rename/add " Elijah Newren
2017-11-20 22:19 ` [RFC PATCH v2 6/9] merge-recursive: improve handling for rename/rename(2to1) conflicts Elijah Newren
2017-11-20 22:19 ` [RFC PATCH v2 7/9] merge-recursive: improve handling for add/add conflicts Elijah Newren
2017-11-20 22:19 ` [RFC PATCH v2 8/9] merge-recursive: accelerate rename detection Elijah Newren
2017-11-20 22:19 ` [RFC PATCH v2 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=20171120221944.15431-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).