From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH v2 00/20] fundamentals of merge-ort implementation
Date: Mon, 2 Nov 2020 12:43:24 -0800
Message-ID: <20201102204344.342633-1-newren@gmail.com> (raw)
This series depends on a merge of en/strmap (after updating to v3) and
en/merge-ort-api-null-impl.
As promised, here's the update of the series due to the strmap
updates...and two other tiny updates.
Changes since v1:
* updates needed based on changes to made in v3 of strmap series
* fixed a typo in a comment
* tiny tweak to move a strmap_put() into setup_paths()
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 | 929 +++++++++++++++++++++++++++++++++++++++++++++++++++-
tree.c | 2 +-
tree.h | 2 +
3 files changed, 929 insertions(+), 4 deletions(-)
--
2.29.0.471.ga4f56089c0
next reply index
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 20:43 Elijah Newren [this message]
2020-11-02 20:43 ` [PATCH v2 01/20] merge-ort: setup basic internal data structures Elijah Newren
2020-11-06 22:05 ` Jonathan Tan
2020-11-06 22:45 ` Elijah Newren
2020-11-09 20:55 ` Jonathan Tan
2020-11-02 20:43 ` [PATCH v2 02/20] merge-ort: add some high-level algorithm structure Elijah Newren
2020-11-02 20:43 ` [PATCH v2 03/20] merge-ort: port merge_start() from merge-recursive Elijah Newren
2020-11-11 13:52 ` Derrick Stolee
2020-11-11 16:22 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 04/20] merge-ort: use histogram diff Elijah Newren
2020-11-11 13:54 ` Derrick Stolee
2020-11-11 16:47 ` Elijah Newren
2020-11-11 16:51 ` Derrick Stolee
2020-11-11 17:03 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 05/20] merge-ort: add an err() function similar to one from merge-recursive Elijah Newren
2020-11-11 13:58 ` Derrick Stolee
2020-11-11 17:07 ` Elijah Newren
2020-11-11 17:10 ` Derrick Stolee
2020-11-02 20:43 ` [PATCH v2 06/20] merge-ort: implement a very basic collect_merge_info() Elijah Newren
2020-11-06 22:19 ` Jonathan Tan
2020-11-06 23:10 ` Elijah Newren
2020-11-09 20:59 ` Jonathan Tan
2020-11-11 14:38 ` Derrick Stolee
2020-11-11 17:02 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 07/20] merge-ort: avoid repeating fill_tree_descriptor() on the same tree Elijah Newren
2020-11-11 14:51 ` Derrick Stolee
2020-11-11 17:13 ` Elijah Newren
2020-11-11 17:21 ` Eric Sunshine
2020-11-02 20:43 ` [PATCH v2 08/20] merge-ort: compute a few more useful fields for collect_merge_info Elijah Newren
2020-11-06 22:52 ` Jonathan Tan
2020-11-06 23:41 ` Elijah Newren
2020-11-09 22:04 ` Jonathan Tan
2020-11-09 23:05 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 09/20] merge-ort: record stage and auxiliary info for every path Elijah Newren
2020-11-06 22:58 ` Jonathan Tan
2020-11-07 0:26 ` Elijah Newren
2020-11-09 22:09 ` Jonathan Tan
2020-11-09 23:08 ` Elijah Newren
2020-11-11 15:26 ` Derrick Stolee
2020-11-11 18:16 ` Elijah Newren
2020-11-11 22:06 ` Elijah Newren
2020-11-12 18:23 ` Derrick Stolee
2020-11-12 18:39 ` Derrick Stolee
2020-11-02 20:43 ` [PATCH v2 10/20] merge-ort: avoid recursing into identical trees Elijah Newren
2020-11-11 15:31 ` Derrick Stolee
2020-11-02 20:43 ` [PATCH v2 11/20] merge-ort: add a preliminary simple process_entries() implementation Elijah Newren
2020-11-11 19:51 ` Jonathan Tan
2020-11-12 1:48 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 12/20] merge-ort: have process_entries operate in a defined order Elijah Newren
2020-11-11 16:09 ` Derrick Stolee
2020-11-11 18:58 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 13/20] merge-ort: step 1 of tree writing -- record basenames, modes, and oids Elijah Newren
2020-11-11 20:01 ` Jonathan Tan
2020-11-11 20:24 ` Elijah Newren
2020-11-12 20:39 ` Jonathan Tan
2020-11-02 20:43 ` [PATCH v2 14/20] merge-ort: step 2 of tree writing -- function to create tree object Elijah Newren
2020-11-11 20:47 ` Jonathan Tan
2020-11-11 21:21 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 15/20] merge-ort: step 3 of tree writing -- handling subdirectories as we go Elijah Newren
2020-11-12 20:15 ` Jonathan Tan
2020-11-12 22:30 ` Elijah Newren
2020-11-24 20:19 ` Elijah Newren
2020-11-25 2:07 ` Jonathan Tan
2020-11-26 18:13 ` Elijah Newren
2020-11-30 18:41 ` Jonathan Tan
2020-11-02 20:43 ` [PATCH v2 16/20] merge-ort: basic outline for merge_switch_to_result() Elijah Newren
2020-11-02 20:43 ` [PATCH v2 17/20] merge-ort: add implementation of checkout() Elijah Newren
2020-11-02 20:43 ` [PATCH v2 18/20] tree: enable cmp_cache_name_compare() to be used elsewhere Elijah Newren
2020-11-02 20:43 ` [PATCH v2 19/20] merge-ort: add implementation of record_unmerged_index_entries() Elijah Newren
2020-11-02 20:43 ` [PATCH v2 20/20] merge-ort: free data structures in merge_finalize() Elijah Newren
2020-11-03 14:49 ` [PATCH v2 00/20] fundamentals of merge-ort implementation Derrick Stolee
2020-11-03 16:36 ` Elijah Newren
2020-11-07 6:06 ` Elijah Newren
2020-11-07 15:02 ` Derrick Stolee
2020-11-07 19:39 ` Elijah Newren
2020-11-09 12:30 ` Derrick Stolee
2020-11-09 17:13 ` Elijah Newren
2020-11-09 19:51 ` Derrick Stolee
2020-11-09 22:44 ` Elijah Newren
2020-11-11 17:08 ` Derrick Stolee
2020-11-11 18:35 ` Elijah Newren
2020-11-11 20:48 ` Derrick Stolee
2020-11-11 21:18 ` Elijah Newren
2020-11-29 7:43 [PATCH " Elijah Newren via GitGitGadget
2020-12-04 20:47 ` [PATCH v2 " Elijah Newren via GitGitGadget
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=20201102204344.342633-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
Git Mailing List Archive on lore.kernel.org
Archives are clonable:
git clone --mirror https://lore.kernel.org/git/0 git/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 git git/ https://lore.kernel.org/git \
git@vger.kernel.org
public-inbox-index git
Example config snippet for mirrors
Newsgroup available over NNTP:
nntp://nntp.lore.kernel.org/org.kernel.vger.git
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git