From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH 11/20] merge-ort: add a preliminary simple process_entries() implementation
Date: Thu, 29 Oct 2020 20:41:22 -0700 [thread overview]
Message-ID: <20201030034131.1479968-12-newren@gmail.com> (raw)
In-Reply-To: <20201030034131.1479968-1-newren@gmail.com>
Add a process_entries() implementation that just loops over the paths
and processes each one individually with an auxiliary process_entry()
call. Add a basic process_entry() as well, which handles several cases
but leaves a few of the more involved ones with die-not-implemented
messages. Also, although process_entries() is supposed to create a
tree, it does not yet have code to do so -- except in the special case
of merging completely empty trees.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
merge-ort.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 105 insertions(+), 1 deletion(-)
diff --git a/merge-ort.c b/merge-ort.c
index 2a402e18ed..f4bf1baf78 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -324,10 +324,114 @@ static int detect_and_process_renames(struct merge_options *opt,
return clean;
}
+/* Per entry merge function */
+static void process_entry(struct merge_options *opt,
+ const char *path,
+ struct conflict_info *ci)
+{
+ assert(!ci->merged.clean);
+ assert(ci->filemask >= 0 && ci->filemask <= 7);
+
+ if (ci->filemask == 0) {
+ /*
+ * This is a placeholder for directories that were recursed
+ * into; nothing to do in this case.
+ */
+ return;
+ }
+
+ if (ci->df_conflict) {
+ die("Not yet implemented.");
+ }
+
+ /*
+ * NOTE: Below there is a long switch-like if-elseif-elseif... block
+ * which the code goes through even for the df_conflict cases
+ * above. Well, it will once we don't die-not-implemented above.
+ */
+ if (ci->match_mask) {
+ ci->merged.clean = 1;
+ if (ci->match_mask == 6) {
+ /* stages[1] == stages[2] */
+ ci->merged.result.mode = ci->stages[1].mode;
+ oidcpy(&ci->merged.result.oid, &ci->stages[1].oid);
+ } else {
+ /* determine the mask of the side that didn't match */
+ unsigned int othermask = 7 & ~ci->match_mask;
+ int side = (othermask == 4) ? 2 : 1;
+
+ ci->merged.is_null = (ci->filemask == ci->match_mask);
+ ci->merged.result.mode = ci->stages[side].mode;
+ oidcpy(&ci->merged.result.oid, &ci->stages[side].oid);
+
+ assert(othermask == 2 || othermask == 4);
+ assert(ci->merged.is_null == !ci->merged.result.mode);
+ }
+ } else if (ci->filemask >= 6 &&
+ (S_IFMT & ci->stages[1].mode) !=
+ (S_IFMT & ci->stages[2].mode)) {
+ /*
+ * Two different items from (file/submodule/symlink)
+ */
+ die("Not yet implemented.");
+ } else if (ci->filemask >= 6) {
+ /*
+ * TODO: Needs a two-way or three-way content merge, but we're
+ * just being lazy and copying the version from HEAD and
+ * leaving it as conflicted.
+ */
+ ci->merged.clean = 0;
+ ci->merged.result.mode = ci->stages[1].mode;
+ oidcpy(&ci->merged.result.oid, &ci->stages[1].oid);
+ } else if (ci->filemask == 3 || ci->filemask == 5) {
+ /* Modify/delete */
+ die("Not yet implemented.");
+ } else if (ci->filemask == 2 || ci->filemask == 4) {
+ /* Added on one side */
+ int side = (ci->filemask == 4) ? 2 : 1;
+ ci->merged.result.mode = ci->stages[side].mode;
+ oidcpy(&ci->merged.result.oid, &ci->stages[side].oid);
+ ci->merged.clean = !ci->df_conflict && !ci->path_conflict;
+ } else if (ci->filemask == 1) {
+ /* Deleted on both sides */
+ ci->merged.is_null = 1;
+ ci->merged.result.mode = 0;
+ oidcpy(&ci->merged.result.oid, &null_oid);
+ ci->merged.clean = !ci->path_conflict;
+ }
+
+ /*
+ * If still unmerged, record it separately. This allows us to later
+ * iterate over just unmerged entries when updating the index instead
+ * of iterating over all entries.
+ */
+ if (!ci->merged.clean)
+ strmap_put(&opt->priv->unmerged, path, ci);
+}
+
static void process_entries(struct merge_options *opt,
struct object_id *result_oid)
{
- die("Not yet implemented.");
+ struct hashmap_iter iter;
+ struct strmap_entry *e;
+
+ if (strmap_empty(&opt->priv->paths)) {
+ oidcpy(result_oid, opt->repo->hash_algo->empty_tree);
+ return;
+ }
+
+ strmap_for_each_entry(&opt->priv->paths, &iter, e) {
+ /*
+ * WARNING: If ci->merged.clean is true, then ci does not
+ * actually point to a conflict_info but a struct merge_info.
+ */
+ struct conflict_info *ci = e->value;
+
+ if (!ci->merged.clean)
+ process_entry(opt, e->key, e->value);
+ }
+
+ die("Tree creation not yet implemented");
}
void merge_switch_to_result(struct merge_options *opt,
--
2.29.1.56.ga287c268e6.dirty
next prev parent reply other threads:[~2020-10-30 3:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 3:41 [PATCH 00/20] fundamentals of merge-ort implementation Elijah Newren
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 ` Elijah Newren [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2020-11-29 7:43 Elijah Newren via GitGitGadget
2020-11-29 7:43 ` [PATCH 11/20] merge-ort: add a preliminary simple process_entries() implementation 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
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=20201030034131.1479968-12-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).