From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F3E7C4361A for ; Fri, 4 Dec 2020 20:49:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38C9A22CF6 for ; Fri, 4 Dec 2020 20:49:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729924AbgLDUt0 (ORCPT ); Fri, 4 Dec 2020 15:49:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729852AbgLDUtZ (ORCPT ); Fri, 4 Dec 2020 15:49:25 -0500 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9ADBC08E863 for ; Fri, 4 Dec 2020 12:48:28 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id g14so6543777wrm.13 for ; Fri, 04 Dec 2020 12:48:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=AVSHYFXW3EbaNbEARjffEMI0emS4ihimICcXp5mLfeg=; b=k0lMsiawkf6iRaGTMraSROn0li8gdQtBYTn7WI/mMOUYfHNe2/Zl0djqpWh4zCAUx3 fPJEW76hSpcWYXXpqY0KkUMPRntTDBR49RKbrbP0tz2YtEVDtqNoXYmQ9se+8CXoEnKR TcR4rFbjcYPc12+QpQnEpXKtnK7Yr+/96ec3+z8fAiAJPHK+ffQwBR/oduz5OYdmjIb6 7I5JO2xBgsCkBRW7YQkQpiLraMI0E08dBo4e73+kQ5oF2KzqZGk60qJe/UnQQGWUkmg3 h9iQIcpkUe8vjLoDOjo/lPnGvN6vZWDtvqRgBA7G/CsNAlFWk9DY0QbTvjeGDDRkwUAk HAkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=AVSHYFXW3EbaNbEARjffEMI0emS4ihimICcXp5mLfeg=; b=TOcSecqP3waqGAOVPgCxEWGjEvCSI3p+0w6JdXfzQzV8FsrMWgwJmkaj0l6Tqzd09y 8LgxjvZ0kWOZNAxuI6e0ty3uWpeERNAzVjg3xX/bqGAc40pTRaPJG5XvUgwl4y1Ud3zG CHzWXqyZ3XMz+HKYGiX/0/SZaAC2TSSEfdvpB0wyrd5QGB9+tkmJVQrCla3Z4jGy75xI GOWTPPdaZHmu2EVu8BjY3AdHHx+NZocdgydN8DFeGNOoEn59fDZufZlFJD90cDR0GGO9 72zBWt0mDk05w/6msO/fE2v1r6gbdSXeaHutAWU0JfbtZcXC4xTqfbTGzhXNpTMalmDm nPsA== X-Gm-Message-State: AOAM530MF925Q7E4z9cmEco4Bgi1c9GaZYMJUuxbnLInSmA7kNccI0il q7dlb+278m1s61bHiz19tU6k42bz140= X-Google-Smtp-Source: ABdhPJykApnvv+l8KmGJuiB04dupiWAYaf/rHfJPj+aEmWJcNc3xg1gBz6q2e3XUjw0ICkNWRA6Nag== X-Received: by 2002:a5d:4f10:: with SMTP id c16mr6835815wru.39.1607114907355; Fri, 04 Dec 2020 12:48:27 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t136sm4494816wmt.18.2020.12.04.12.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 12:48:26 -0800 (PST) Message-Id: <6ff56824c336e6268620928f7eb022b71ea07ea9.1607114891.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Fri, 04 Dec 2020 20:48:04 +0000 Subject: [PATCH v2 14/20] merge-ort: step 2 of tree writing -- function to create tree object Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: jonathantanmy@google.com, dstolee@microsoft.com, Elijah Newren , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Elijah Newren , Elijah Newren Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Create a new function, write_tree(), which will take a list of basenames, modes, and oids for a single directory and create a tree object in the object-store. We do not yet have just basenames, modes, and oids for just a single directory (we have a mixture of entries from all directory levels in the hierarchy) so we still die() before the current call to write_tree(), but the next patch will rectify that. Signed-off-by: Elijah Newren --- merge-ort.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/merge-ort.c b/merge-ort.c index 60cd73416e..eec6874943 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -19,6 +19,7 @@ #include "diff.h" #include "diffcore.h" +#include "object-store.h" #include "strmap.h" #include "tree.h" #include "xdiff-interface.h" @@ -496,6 +497,62 @@ struct directory_versions { struct string_list versions; }; +static int tree_entry_order(const void *a_, const void *b_) +{ + const struct string_list_item *a = a_; + const struct string_list_item *b = b_; + + const struct merged_info *ami = a->util; + const struct merged_info *bmi = b->util; + return base_name_compare(a->string, strlen(a->string), ami->result.mode, + b->string, strlen(b->string), bmi->result.mode); +} + +static void write_tree(struct object_id *result_oid, + struct string_list *versions, + unsigned int offset, + size_t hash_size) +{ + size_t maxlen = 0, extra; + unsigned int nr = versions->nr - offset; + struct strbuf buf = STRBUF_INIT; + struct string_list relevant_entries = STRING_LIST_INIT_NODUP; + int i; + + /* + * We want to sort the last (versions->nr-offset) entries in versions. + * Do so by abusing the string_list API a bit: make another string_list + * that contains just those entries and then sort them. + * + * We won't use relevant_entries again and will let it just pop off the + * stack, so there won't be allocation worries or anything. + */ + relevant_entries.items = versions->items + offset; + relevant_entries.nr = versions->nr - offset; + QSORT(relevant_entries.items, relevant_entries.nr, tree_entry_order); + + /* Pre-allocate some space in buf */ + extra = hash_size + 8; /* 8: 6 for mode, 1 for space, 1 for NUL char */ + for (i = 0; i < nr; i++) { + maxlen += strlen(versions->items[offset+i].string) + extra; + } + strbuf_grow(&buf, maxlen); + + /* Write each entry out to buf */ + for (i = 0; i < nr; i++) { + struct merged_info *mi = versions->items[offset+i].util; + struct version_info *ri = &mi->result; + strbuf_addf(&buf, "%o %s%c", + ri->mode, + versions->items[offset+i].string, '\0'); + strbuf_add(&buf, ri->oid.hash, hash_size); + } + + /* Write this object file out, and record in result_oid */ + write_object_file(buf.buf, buf.len, tree_type, result_oid); + strbuf_release(&buf); +} + static void record_entry_for_tree(struct directory_versions *dir_metadata, const char *path, struct merged_info *mi) @@ -648,9 +705,17 @@ static void process_entries(struct merge_options *opt, } } + /* + * TODO: We can't actually write a tree yet, because dir_metadata just + * contains all basenames of all files throughout the tree with their + * mode and hash. Not only is that a nonsensical tree, it will have + * lots of duplicates for paths such as "Makefile" or ".gitignore". + */ + die("Not yet implemented; need to process subtrees separately"); + write_tree(result_oid, &dir_metadata.versions, 0, + opt->repo->hash_algo->rawsz); string_list_clear(&plist, 0); string_list_clear(&dir_metadata.versions, 0); - die("Tree creation not yet implemented"); } void merge_switch_to_result(struct merge_options *opt, -- gitgitgadget