From: Elijah Newren <newren@gmail.com> To: git@vger.kernel.org Cc: Elijah Newren <newren@gmail.com> Subject: [PATCH 08/20] merge-ort: compute a few more useful fields for collect_merge_info Date: Thu, 29 Oct 2020 20:41:19 -0700 [thread overview] Message-ID: <20201030034131.1479968-9-newren@gmail.com> (raw) In-Reply-To: <20201030034131.1479968-1-newren@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> --- merge-ort.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/merge-ort.c b/merge-ort.c index 7083388a47..86d9b87cb9 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -96,6 +96,7 @@ static int collect_merge_info_callback(int n, size_t len; char *fullpath; unsigned filemask = mask & ~dirmask; + unsigned match_mask = 0; /* will be updated below */ unsigned mbase_null = !(mask & 1); unsigned side1_null = !(mask & 2); unsigned side2_null = !(mask & 4); @@ -108,6 +109,13 @@ static int collect_merge_info_callback(int n, unsigned sides_match = (!side1_null && !side2_null && names[1].mode == names[2].mode && oideq(&names[1].oid, &names[2].oid)); + /* + * Note: We only label files with df_conflict, not directories. + * Since directories stay where they are, and files move out of the + * way to make room for a directory, we don't care if there was a + * directory/file conflict for a parent directory of the current path. + */ + unsigned df_conflict = (filemask != 0) && (dirmask != 0); /* n = 3 is a fundamental assumption. */ if (n != 3) @@ -127,6 +135,14 @@ static int collect_merge_info_callback(int n, /* Other invariant checks, mostly for documentation purposes. */ assert(mask == (dirmask | filemask)); + /* Determine match_mask */ + if (side1_matches_mbase) + match_mask = (side2_matches_mbase ? 7 : 3); + else if (side2_matches_mbase) + match_mask = 5; + else if (sides_match) + match_mask = 6; + /* * Get the name of the relevant filepath, which we'll pass to * setup_path_info() for tracking. @@ -145,6 +161,8 @@ static int collect_merge_info_callback(int n, * so we can resolve later in process_entries. */ ci = xcalloc(1, sizeof(struct conflict_info)); + ci->df_conflict = df_conflict; + ci->match_mask = match_mask; strmap_put(&opti->paths, fullpath, ci); /* If dirmask, recurse into subdirectories */ @@ -161,6 +179,13 @@ static int collect_merge_info_callback(int n, newinfo.name = p->path; newinfo.namelen = p->pathlen; newinfo.pathlen = st_add3(newinfo.pathlen, p->pathlen, 1); + /* + * If we did care about parent directories having a D/F + * conflict, then we'd include + * newinfo.df_conflicts |= (mask & ~dirmask); + * here. But we don't. (See comment near setting of local + * df_conflict variable near the beginning of this function). + */ for (i = 0; i < 3; i++, dirmask >>= 1) { if (i == 1 && side1_matches_mbase) -- 2.29.1.56.ga287c268e6.dirty
next prev parent reply other threads:[~2020-10-30 3:43 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 ` Elijah Newren [this message] 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:43 ` [PATCH 08/20] merge-ort: compute a few more useful fields for collect_merge_info 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-9-newren@gmail.com \ --to=newren@gmail.com \ --cc=git@vger.kernel.org \ --subject='Re: [PATCH 08/20] merge-ort: compute a few more useful fields for collect_merge_info' \ /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
Code repositories for project(s) associated with this 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).