From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 6F35A1FA17 for ; Sun, 29 Nov 2020 07:46:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727040AbgK2Hoy (ORCPT ); Sun, 29 Nov 2020 02:44:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726953AbgK2Hoy (ORCPT ); Sun, 29 Nov 2020 02:44:54 -0500 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AE6FC061A52 for ; Sat, 28 Nov 2020 23:43:38 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id 3so11634088wmg.4 for ; Sat, 28 Nov 2020 23:43:38 -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=0/wosQMub37QZjMN2F69GcoUKYnFBqc9X0QlVZOCJT4=; b=VBZEfT8BHjLmtFGOb+xkavWirfdslLanNQVwTJ2WXpUwncoK7Lg/XN9Bk5Ph5jI39A 725+j+pNA0mGPBebtfM2GBuR7XdWvKSlqNwGzImI75qV68E9zh0ayuWfcxKkD46SJf84 siMddBzbaa7bZmrtA7WO/uUEsaIJt76sX+ni7MriggFVUEDLnBLE5iGGy0cpFyTTJt5Q 5UUeX8Pf5uWzaUJPqoo7AYYloBBoyMkUCgONZOFr9OlFOBbb6IGPNYBtNMLXixPSlGNs dGcJOaQLop9poankQ7FklLqbJp+83N9g+n29gSAp/0Nrv32NrvQhXE+lzuyCO2xCxDCS mMeQ== 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=0/wosQMub37QZjMN2F69GcoUKYnFBqc9X0QlVZOCJT4=; b=sgi99zEVz8wm2u8tM+D86DveOPGAb8pUp0Jvyl7hzpIrP/Xa1o9eSfe1EaspDUU8Bc FfMIeKjDGpdLW9jRhhQVF62ZWeAacslDHymw6K/lbYc5u/fdFNOhB8WOAefjQ/EwwWVn h3Mog12cWwr0lIDA1Hc1/p7OVTfaBrf5eqaX2HtfC6jyvOs+AtG/OsI6/+/1hQrGISYa Bdf7xaYaFJeuvqcgs9NTB6lZqhotPeFtsW2WSKLYBNVKj0kJ06uMZPnp5UBfdBQQ8OOJ +R19ocfQFArCvoUhHfW2ZQWTsxeqqT6BBUE/mQrBurQXS4BBzbv9pNGPn12GbFgNV4Mg 5d8Q== X-Gm-Message-State: AOAM532ZSx0T/uopAiJUMYWWp0VxA2UQC9eXySvTfgD2dDdArK5dL15I eOaccrxnsr+3hu/y4j5YJlnM2g5DyBg= X-Google-Smtp-Source: ABdhPJzYKewluhnFzE5yrveRO5Tf8sGtKMLm82Z6xGl2EOgCX2F9oBYFzbY8qfDGKg8gxL9jt93HNQ== X-Received: by 2002:a7b:c385:: with SMTP id s5mr17752879wmj.30.1606635817056; Sat, 28 Nov 2020 23:43:37 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z189sm20160606wme.23.2020.11.28.23.43.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 23:43:36 -0800 (PST) Message-Id: <33a5d23c85357607997a5138da7eaa8ac401049b.1606635803.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Sun, 29 Nov 2020 07:43:17 +0000 Subject: [PATCH 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: 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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/merge-ort.c b/merge-ort.c index 970708fff9..59355de628 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,51 @@ struct directory_versions { struct string_list versions; }; +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; + string_list_sort(&relevant_entries); + + /* 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 +694,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