Skip to content

fundamentals of merge-ort implementation

Elijah Newren git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest20 patches 62 repliesIn review
  2. v120 patches 1 replySuperseded

Changes in v2 from the cover letter

* 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()

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/20merge-ort: setup basic internal data structuresmerge-ort.c+40 -03 replies
2/20merge-ort: add some high-level algorithm structuremerge-ort.c+66 -10 replies
3/20merge-ort: port merge_start() from merge-recursivemerge-ort.c+43 -12 replies
4/20merge-ort: use histogram diffmerge-ort.c+4 -04 replies
5/20merge-ort: add an err() function similar to one from merge-recursivemerge-ort.c+26 -13 replies
6/20merge-ort: implement a very basic collect_merge_info()merge-ort.c+119 -25 replies
7/20merge-ort: avoid repeating fill_tree_descriptor() on the same treemerge-ort.c+22 -43 replies
8/20merge-ort: compute a few more useful fields for collect_merge_infomerge-ort.c+25 -04 replies
9/20merge-ort: record stage and auxiliary info for every pathmerge-ort.c+54 -79 replies
10/20merge-ort: avoid recursing into identical treesmerge-ort.c+13 -01 reply
11/20merge-ort: add a preliminary simple process_entries() implementationmerge-ort.c+105 -12 replies
12/20merge-ort: have process_entries operate in a defined ordermerge-ort.c+47 -22 replies
13/20merge-ort: step 1 of tree writing -- record basenames, modes, and oidsmerge-ort.c+32 -33 replies
14/20merge-ort: step 2 of tree writing -- function to create tree objectmerge-ort.c+53 -12 replies
15/20merge-ort: step 3 of tree writing -- handling subdirectories as we gomerge-ort.c+106 -76 replies
16/20merge-ort: basic outline for merge_switch_to_result()merge-ort.c+41 -10 replies
17/20merge-ort: add implementation of checkout()merge-ort.c+44 -10 replies
18/20tree: enable cmp_cache_name_compare() to be used elsewheretree.c tree.h+3 -10 replies
19/20merge-ort: add implementation of record_unmerged_index_entries()merge-ort.c+86 -10 replies
20/20merge-ort: free data structures in merge_finalize()merge-ort.c+31 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 00/20] fundamentals of merge-ort implementation

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(-)
Signature · 1 line
2.29.0.471.ga4f56089c0