From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH 00/20] fundamentals of merge-ort implementation
Date: Thu, 29 Oct 2020 20:41:11 -0700 [thread overview]
Message-ID: <20201030034131.1479968-1-newren@gmail.com> (raw)
This series depends on a merge of en/strmap and
en/merge-ort-api-null-impl.
The goal of this series is to show the new design and structure behind
merge-ort, particularly the bits that are completely different to how
merge-recursive operates. There are still multiple important codepaths
that die with a "Not yet implemented" message, so the new merge
algorithm is still not very usable (however, it can handle very trivial
rebases or cherry-picks at the end of the series).
At a high level, merge-ort avoids unpack_trees() and the index, instead
using traverse_trees() and its own data structure. After it is done
processing each path, it writes a tree. Only after it has created a new
tree will it touch the working copy or the index. It does so by using a
simple checkout-like step to switch from head to the newly created tree.
If there are unmerged entries, it touches up the index after the
checkout-like step to record those higher order stages.
In the series:
* Patch 1 adds some basic data structures.
* Patch 2 documents the high-level steps.
* Patches 3-5 are some simple setup.
* Patches 6-10 collect data from the traverse_trees() operation.
* Patches 11-15 process the individual paths and create a tree.
* Patches 16-19 handle checkout-and-then-write-higher-order-stages.
* Patch 20 frees data from the merge_options_internal data structure
Elijah Newren (20):
merge-ort: setup basic internal data structures
merge-ort: add some high-level algorithm structure
merge-ort: port merge_start() from merge-recursive
merge-ort: use histogram diff
merge-ort: add an err() function similar to one from merge-recursive
merge-ort: implement a very basic collect_merge_info()
merge-ort: avoid repeating fill_tree_descriptor() on the same tree
merge-ort: compute a few more useful fields for collect_merge_info
merge-ort: record stage and auxiliary info for every path
merge-ort: avoid recursing into identical trees
merge-ort: add a preliminary simple process_entries() implementation
merge-ort: have process_entries operate in a defined order
merge-ort: step 1 of tree writing -- record basenames, modes, and oids
merge-ort: step 2 of tree writing -- function to create tree object
merge-ort: step 3 of tree writing -- handling subdirectories as we go
merge-ort: basic outline for merge_switch_to_result()
merge-ort: add implementation of checkout()
tree: enable cmp_cache_name_compare() to be used elsewhere
merge-ort: add implementation of record_unmerged_index_entries()
merge-ort: free data structures in merge_finalize()
merge-ort.c | 922 +++++++++++++++++++++++++++++++++++++++++++++++++++-
tree.c | 2 +-
tree.h | 2 +
3 files changed, 922 insertions(+), 4 deletions(-)
--
2.29.1.56.ga287c268e6.dirty
next reply other threads:[~2020-10-30 3:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 3:41 Elijah Newren [this message]
2020-10-30 3:41 ` [PATCH 01/20] merge-ort: setup basic internal data structures Elijah Newren
2020-10-30 3:41 ` [PATCH 02/20] merge-ort: add some high-level algorithm structure Elijah Newren
2020-10-30 3:41 ` [PATCH 03/20] merge-ort: port merge_start() from merge-recursive Elijah Newren
2020-10-30 3:41 ` [PATCH 04/20] merge-ort: use histogram diff Elijah Newren
2020-10-30 3:41 ` [PATCH 05/20] merge-ort: add an err() function similar to one from merge-recursive Elijah Newren
2020-10-30 3:41 ` [PATCH 06/20] merge-ort: implement a very basic collect_merge_info() Elijah Newren
2020-10-30 3:41 ` [PATCH 07/20] merge-ort: avoid repeating fill_tree_descriptor() on the same tree Elijah Newren
2020-10-30 3:41 ` [PATCH 08/20] merge-ort: compute a few more useful fields for collect_merge_info Elijah Newren
2020-10-30 3:41 ` [PATCH 09/20] merge-ort: record stage and auxiliary info for every path Elijah Newren
2020-10-30 3:41 ` [PATCH 10/20] merge-ort: avoid recursing into identical trees Elijah Newren
2020-10-30 3:41 ` [PATCH 11/20] merge-ort: add a preliminary simple process_entries() implementation Elijah Newren
2020-10-30 3:41 ` [PATCH 12/20] merge-ort: have process_entries operate in a defined order Elijah Newren
2020-10-30 3:41 ` [PATCH 13/20] merge-ort: step 1 of tree writing -- record basenames, modes, and oids Elijah Newren
2020-10-30 3:41 ` [PATCH 14/20] merge-ort: step 2 of tree writing -- function to create tree object Elijah Newren
2020-10-30 3:41 ` [PATCH 15/20] merge-ort: step 3 of tree writing -- handling subdirectories as we go Elijah Newren
2020-10-30 3:41 ` [PATCH 16/20] merge-ort: basic outline for merge_switch_to_result() Elijah Newren
2020-10-30 3:41 ` [PATCH 17/20] merge-ort: add implementation of checkout() Elijah Newren
2020-10-30 3:41 ` [PATCH 18/20] tree: enable cmp_cache_name_compare() to be used elsewhere Elijah Newren
2020-10-30 3:41 ` [PATCH 19/20] merge-ort: add implementation of record_unmerged_index_entries() Elijah Newren
2020-10-30 3:41 ` [PATCH 20/20] merge-ort: free data structures in merge_finalize() Elijah Newren
2020-10-30 3:58 ` [PATCH 00/20] fundamentals of merge-ort implementation Elijah Newren
2020-11-29 7:43 Elijah Newren via GitGitGadget
2020-11-29 7:47 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201030034131.1479968-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.
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.