Set up some basic internal data structures. The only carry-over from
merge-recursive.c is call_depth, though needed_rename_limit will be
added later.
The central piece of data will definitely be the strmap "paths", which
will map every relevant pathname under consideration to either a
merged_info or a conflict_info. ("unmerged" is a strmap that is a
subset of "paths".)
merged_info contains all relevant information for a non-conflicted
entry. conflict_info contains a merged_info, plus any additional
information about a conflict such as the higher orders stages involved
and the names of the paths those came from (handy once renames get
involved). If an entry remains conflicted, the merged_info portion of a
conflict_info will later be filled with whatever version of the file
should be placed in the working directory (e.g. an as-merged-as-possible
variation that contains conflict markers).
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
---
merge-ort.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/merge-ort.c b/merge-ort.c
index b487901d3e..9d5ea0930d 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -17,6 +17,46 @@
#include "cache.h"
#include "merge-ort.h"
+#include "strmap.h"
+
+struct merge_options_internal {
+ struct strmap paths; /* maps path -> (merged|conflict)_info */
+ struct strmap unmerged; /* maps path -> conflict_info */
+ const char *current_dir_name;
+ int call_depth;
+};
+
+struct version_info {
+ struct object_id oid;
+ unsigned short mode;
+};
+
+struct merged_info {
+ struct version_info result;
+ unsigned is_null:1;
+ unsigned clean:1;
+ size_t basename_offset;
+ /*
+ * Containing directory name. Note that we assume directory_name is
+ * constructed such that
+ * strcmp(dir1_name, dir2_name) == 0 iff dir1_name == dir2_name,
+ * i.e. string equality is equivalent to pointer equality. For this
+ * to hold, we have to be careful setting directory_name.
+ */
+ const char *directory_name;
+};
+
+struct conflict_info {
+ struct merged_info merged;
+ struct version_info stages[3];
+ const char *pathnames[3];
+ unsigned df_conflict:1;
+ unsigned path_conflict:1;
+ unsigned filemask:3;
+ unsigned dirmask:3;
+ unsigned match_mask:3;
+};
+
void merge_switch_to_result(struct merge_options *opt,
struct tree *head,
struct merge_result *result,
--
2.29.0.471.ga4f56089c0
