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-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.0 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,RCVD_IN_DNSWL_LOW, 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 9305E1F9F4 for ; Fri, 13 Aug 2021 08:25:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238858AbhHMIX7 (ORCPT ); Fri, 13 Aug 2021 04:23:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238615AbhHMIXs (ORCPT ); Fri, 13 Aug 2021 04:23:48 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E17EC0617AE for ; Fri, 13 Aug 2021 01:23:21 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id f5so12088218wrm.13 for ; Fri, 13 Aug 2021 01:23:21 -0700 (PDT) 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:mime-version :content-transfer-encoding:fcc:to:cc; bh=ToHDwQjxG11gRqhYcRQilRtbLuv3mILTyrTDp4s4nuc=; b=M7GKN1ZiQyNxUSE/zTYcCLsVngZHnr0jfuwjcEGLQ2C4w0yMHCozYzJF5prS0kWIkQ 2CIFyley0LM05XQ6sX9gWfyzN/km2lTldWanE/fl9r5XN2buRVyJlqdxyp8p9oSuVXoc KucwHlRJt/4MHMuMmMrsaV5yAb53xf0BmNdzA7vNirqX57xh0VVtrveueLoM7DNTz6E8 QP0rcsLzujGKkX7CvFQ37JZtiMkyEzuV1mC+KVe8H6tznKTYBHNVarywTTCcbV6JKQBI h/XJ0wIHeg1bhHSuLbeF90PJ5nU7bWvelKXSygFHHpawa3p8qewa/g0U1UnCwAhr1t1d x71A== 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:mime-version:content-transfer-encoding:fcc:to:cc; bh=ToHDwQjxG11gRqhYcRQilRtbLuv3mILTyrTDp4s4nuc=; b=V9QkjuFhtUMwXc51u8Siz5lkHl2LYM9VZYtSDoX5ao5vSz9XPW5SKVWNIwALXt8yeR DZtx+oeEWfYtt3gE5wdO2fmimMB+Mse97CE9dR1uRBbhGzpphNVOXsG/wUH0Ntrcp+dY JzYg5mmXpEH5kYmvHds9F3LADFa7Jz5v+UWzO6WX2AgdvxWp1sXjhL+x802+2bwnSW42 rjNnIqHjIMlNW+FY0mH1+1EKfw5f2LeaDWNeu46nDCjyQUmyC4e6g8snOJsaFZdtZtVL ItXqrb9LnGfzi0fZZenlM02sFWcaq3MA801s8zYozW2mXyMB0iqor6wba5yuvJLAdVXM rrKA== X-Gm-Message-State: AOAM531v9WBLl1L5FeuNC8GfPYQaIGqUw+oyIRRuwM+0aWTig9Ed4UcI P3RfW+Nh2d/5IrtNj3wLCvzWiboBJck= X-Google-Smtp-Source: ABdhPJxxV02WPmZUM8RjxHx47pdFsISOjL1JGLMaFCEIsu3jYgKOWdgrvBsQPbI5Uuex1/p9eQMTXQ== X-Received: by 2002:a5d:464a:: with SMTP id j10mr1641988wrs.190.1628843000175; Fri, 13 Aug 2021 01:23:20 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z13sm827079wrs.71.2021.08.13.01.23.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Aug 2021 01:23:19 -0700 (PDT) Message-Id: <9c5fddf6885875ccd3ce3f047bb938c77d9bbca2.1628842990.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "ZheNing Hu via GitGitGadget" Date: Fri, 13 Aug 2021 08:22:56 +0000 Subject: [PATCH 13/27] [GSOC] cat-file: reuse ref-filter logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fcc: Sent To: git@vger.kernel.org Cc: Junio C Hamano , Christian Couder , Hariom Verma , Bagas Sanjaya , Jeff King , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Eric Sunshine , Philip Oakley , ZheNing Hu , ZheNing Hu Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: ZheNing Hu In order to let cat-file use ref-filter logic, let's do the following: 1. Change the type of member `format` in struct `batch_options` to `ref_format`, we will pass it to ref-filter later. 2. Let `batch_objects()` add atoms to format, and use `verify_ref_format()` to check atoms. 3. Use `format_ref_array_item()` in `batch_object_write()` to get the formatted data corresponding to the object. If the return value of `format_ref_array_item()` is equals to zero, use `batch_write()` to print object data; else if the return value is less than zero, use `die()` to print the error message and exit; else if return value is greater than zero, only print the error message, but don't exit. 4. Use free_ref_array_item_value() to free ref_array_item's value, and use free_global_resource() to free global memory allocated resource. Most of the atoms in `for-each-ref --format` are now supported, such as `%(tree)`, `%(parent)`, `%(author)`, `%(tagger)`, `%(if)`, `%(then)`, `%(else)`, `%(end)`. But these atoms will be rejected: `%(refname)`, `%(symref)`, `%(upstream)`, `%(push)`, `%(worktreepath)`, `%(flag)`, `%(HEAD)`, because these atoms are unique to those objects that pointed to by a ref, "for-each-ref"'s family can naturally use these atoms, but not all objects are pointed to be a ref, so "cat-file" will not be able to use them. The performance for `git cat-file --batch-all-objects --batch-check` on the Git repository itself with performance testing tool `hyperfine` changes from 616.7 ms ± 8.9 ms to 758.7 ms ± 16.4 ms. The performance for `git cat-file --batch-all-objects --batch >/dev/null` on the Git repository itself with performance testing tool `time` change from "25.26s user 0.30s system 98% cpu 25.840 total" to "28.79s user 0.83s system 99% cpu 29.829 total". The reasons for the performance degradation are as follows: 1. There are a lot of data copies in the logic of ref-filter. 2, In order to be able to support more useful formats, complex data structure and parsing process are used in ref-filter. Later patches will gradually deal with the problem of performance degradation. Mentored-by: Christian Couder Mentored-by: Hariom Verma Signed-off-by: ZheNing Hu --- Documentation/git-cat-file.txt | 6 + builtin/cat-file.c | 245 +++++++-------------------------- ref-filter.c | 20 ++- ref-filter.h | 2 + t/t1006-cat-file.sh | 229 +++++++++++++++--------------- 5 files changed, 191 insertions(+), 311 deletions(-) diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index 4eb0421b3fd..ef8ab952b2f 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -226,6 +226,12 @@ newline. The available atoms are: after that first run of whitespace (i.e., the "rest" of the line) are output in place of the `%(rest)` atom. +Note that most of the atoms in `for-each-ref --format` are now supported, +such as `%(tree)`, `%(parent)`, `%(author)`, `%(tagger)`, `%(if)`, +`%(then)`, `%(else)`, `%(end)`. But these atoms will be rejected: +`%(refname)`, `%(symref)`, `%(upstream)`, `%(push)`, `%(worktreepath)`, +`%(flag)`, `%(HEAD)`. See linkgit:git-for-each-ref[1]. + If no format is specified, the default format is `%(objectname) %(objecttype) %(objectsize)`. diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 41d407638d5..306b4d49493 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -16,6 +16,7 @@ #include "packfile.h" #include "object-store.h" #include "promisor-remote.h" +#include "ref-filter.h" struct batch_options { int enabled; @@ -25,7 +26,7 @@ struct batch_options { int all_objects; int unordered; int cmdmode; /* may be 'w' or 'c' for --filters or --textconv */ - const char *format; + struct ref_format format; }; static const char *force_path; @@ -195,99 +196,10 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, struct expand_data { struct object_id oid; - enum object_type type; - unsigned long size; - off_t disk_size; const char *rest; - struct object_id delta_base_oid; - - /* - * If mark_query is true, we do not expand anything, but rather - * just mark the object_info with items we wish to query. - */ - int mark_query; - - /* - * Whether to split the input on whitespace before feeding it to - * get_sha1; this is decided during the mark_query phase based on - * whether we have a %(rest) token in our format. - */ int split_on_whitespace; - - /* - * After a mark_query run, this object_info is set up to be - * passed to oid_object_info_extended. It will point to the data - * elements above, so you can retrieve the response from there. - */ - struct object_info info; - - /* - * This flag will be true if the requested batch format and options - * don't require us to call oid_object_info, which can then be - * optimized out. - */ - unsigned skip_object_info : 1; }; -static int is_atom(const char *atom, const char *s, int slen) -{ - int alen = strlen(atom); - return alen == slen && !memcmp(atom, s, alen); -} - -static void expand_atom(struct strbuf *sb, const char *atom, int len, - void *vdata) -{ - struct expand_data *data = vdata; - - if (is_atom("objectname", atom, len)) { - if (!data->mark_query) - strbuf_addstr(sb, oid_to_hex(&data->oid)); - } else if (is_atom("objecttype", atom, len)) { - if (data->mark_query) - data->info.typep = &data->type; - else - strbuf_addstr(sb, type_name(data->type)); - } else if (is_atom("objectsize", atom, len)) { - if (data->mark_query) - data->info.sizep = &data->size; - else - strbuf_addf(sb, "%"PRIuMAX , (uintmax_t)data->size); - } else if (is_atom("objectsize:disk", atom, len)) { - if (data->mark_query) - data->info.disk_sizep = &data->disk_size; - else - strbuf_addf(sb, "%"PRIuMAX, (uintmax_t)data->disk_size); - } else if (is_atom("rest", atom, len)) { - if (data->mark_query) - data->split_on_whitespace = 1; - else if (data->rest) - strbuf_addstr(sb, data->rest); - } else if (is_atom("deltabase", atom, len)) { - if (data->mark_query) - data->info.delta_base_oid = &data->delta_base_oid; - else - strbuf_addstr(sb, - oid_to_hex(&data->delta_base_oid)); - } else - die("unknown format element: %.*s", len, atom); -} - -static size_t expand_format(struct strbuf *sb, const char *start, void *data) -{ - const char *end; - - if (*start != '(') - return 0; - end = strchr(start + 1, ')'); - if (!end) - die("format element '%s' does not end in ')'", start); - - expand_atom(sb, start + 1, end - start - 1, data); - - return end - start + 1; -} - static void batch_write(struct batch_options *opt, const void *data, int len) { if (opt->buffer_output) { @@ -297,87 +209,34 @@ static void batch_write(struct batch_options *opt, const void *data, int len) write_or_die(1, data, len); } -static void print_object_or_die(struct batch_options *opt, struct expand_data *data) -{ - const struct object_id *oid = &data->oid; - - assert(data->info.typep); - - if (data->type == OBJ_BLOB) { - if (opt->buffer_output) - fflush(stdout); - if (opt->cmdmode) { - char *contents; - unsigned long size; - - if (!data->rest) - die("missing path for '%s'", oid_to_hex(oid)); - - if (opt->cmdmode == 'w') { - if (filter_object(data->rest, 0100644, oid, - &contents, &size)) - die("could not convert '%s' %s", - oid_to_hex(oid), data->rest); - } else if (opt->cmdmode == 'c') { - enum object_type type; - if (!textconv_object(the_repository, - data->rest, 0100644, oid, - 1, &contents, &size)) - contents = read_object_file(oid, - &type, - &size); - if (!contents) - die("could not convert '%s' %s", - oid_to_hex(oid), data->rest); - } else - BUG("invalid cmdmode: %c", opt->cmdmode); - batch_write(opt, contents, size); - free(contents); - } else { - stream_blob(oid); - } - } - else { - enum object_type type; - unsigned long size; - void *contents; - - contents = read_object_file(oid, &type, &size); - if (!contents) - die("object %s disappeared", oid_to_hex(oid)); - if (type != data->type) - die("object %s changed type!?", oid_to_hex(oid)); - if (data->info.sizep && size != data->size) - die("object %s changed size!?", oid_to_hex(oid)); - - batch_write(opt, contents, size); - free(contents); - } -} static void batch_object_write(const char *obj_name, struct strbuf *scratch, struct batch_options *opt, struct expand_data *data) { - if (!data->skip_object_info && - oid_object_info_extended(the_repository, &data->oid, &data->info, - OBJECT_INFO_LOOKUP_REPLACE) < 0) { - printf("%s missing\n", - obj_name ? obj_name : oid_to_hex(&data->oid)); - fflush(stdout); - return; - } + int ret; + struct strbuf err = STRBUF_INIT; + struct ref_array_item item = { data->oid, data->rest }; strbuf_reset(scratch); - strbuf_expand(scratch, opt->format, expand_format, data); - strbuf_addch(scratch, '\n'); - batch_write(opt, scratch->buf, scratch->len); - if (opt->print_contents) { - print_object_or_die(opt, data); - batch_write(opt, "\n", 1); + ret = format_ref_array_item(&item, &opt->format, scratch, &err); + if (ret < 0) + die("%s\n", err.buf); + if (ret) { + /* ret > 0 means when the object corresponding to oid + * cannot be found in format_ref_array_item(), we only print + * the error message. + */ + printf("%s\n", err.buf); + fflush(stdout); + } else { + strbuf_addch(scratch, '\n'); + batch_write(opt, scratch->buf, scratch->len); } + free_ref_array_item_value(&item); + strbuf_release(&err); } static void batch_one_object(const char *obj_name, @@ -495,43 +354,37 @@ static int batch_unordered_packed(const struct object_id *oid, return batch_unordered_object(oid, data); } -static int batch_objects(struct batch_options *batch) +static const char * const cat_file_usage[] = { + N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | | --textconv | --filters) [--path=] "), + N_("git cat-file (--batch[=] | --batch-check[=]) [--follow-symlinks] [--textconv | --filters]"), + NULL +}; + +static int batch_objects(struct batch_options *batch, const struct option *options) { struct strbuf input = STRBUF_INIT; struct strbuf output = STRBUF_INIT; + struct strbuf format = STRBUF_INIT; struct expand_data data; int save_warning; int retval = 0; - if (!batch->format) - batch->format = "%(objectname) %(objecttype) %(objectsize)"; - - /* - * Expand once with our special mark_query flag, which will prime the - * object_info to be handed to oid_object_info_extended for each - * object. - */ memset(&data, 0, sizeof(data)); - data.mark_query = 1; - strbuf_expand(&output, batch->format, expand_format, &data); - data.mark_query = 0; - strbuf_release(&output); - if (batch->cmdmode) - data.split_on_whitespace = 1; - - /* - * If we are printing out the object, then always fill in the type, - * since we will want to decide whether or not to stream. - */ + if (batch->format.format) + strbuf_addstr(&format, batch->format.format); + else + strbuf_addstr(&format, "%(objectname) %(objecttype) %(objectsize)"); if (batch->print_contents) - data.info.typep = &data.type; + strbuf_addstr(&format, "\n%(raw)"); + batch->format.format = format.buf; + if (verify_ref_format(&batch->format)) + usage_with_options(cat_file_usage, options); + + if (batch->cmdmode || batch->format.use_rest) + data.split_on_whitespace = 1; if (batch->all_objects) { struct object_cb_data cb; - struct object_info empty = OBJECT_INFO_INIT; - - if (!memcmp(&data.info, &empty, sizeof(empty))) - data.skip_object_info = 1; if (has_promisor_remote()) warning("This repository uses promisor remotes. Some objects may not be loaded."); @@ -560,8 +413,9 @@ static int batch_objects(struct batch_options *batch) oid_array_clear(&sa); } - + strbuf_release(&format); strbuf_release(&output); + free_global_resource(); return 0; } @@ -593,18 +447,14 @@ static int batch_objects(struct batch_options *batch) batch_one_object(input.buf, &output, batch, &data); } + strbuf_release(&format); strbuf_release(&input); strbuf_release(&output); + free_global_resource(); warn_on_object_refname_ambiguity = save_warning; return retval; } -static const char * const cat_file_usage[] = { - N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | | --textconv | --filters) [--path=] "), - N_("git cat-file (--batch[=] | --batch-check[=]) [--follow-symlinks] [--textconv | --filters]"), - NULL -}; - static int git_cat_file_config(const char *var, const char *value, void *cb) { if (userdiff_config(var, value) < 0) @@ -627,7 +477,7 @@ static int batch_option_callback(const struct option *opt, bo->enabled = 1; bo->print_contents = !strcmp(opt->long_name, "batch"); - bo->format = arg; + bo->format.format = arg; return 0; } @@ -636,7 +486,9 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) { int opt = 0; const char *exp_type = NULL, *obj_name = NULL; - struct batch_options batch = {0}; + struct batch_options batch = { + .format = REF_FORMAT_INIT + }; int unknown_type = 0; const struct option options[] = { @@ -675,6 +527,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) git_config(git_cat_file_config, NULL); batch.buffer_output = -1; + batch.format.cat_file_mode = 1; argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0); if (opt) { @@ -718,7 +571,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) batch.buffer_output = batch.all_objects; if (batch.enabled) - return batch_objects(&batch); + return batch_objects(&batch, options); if (unknown_type && opt != 't' && opt != 's') die("git cat-file --allow-unknown-type: use with -s or -t"); diff --git a/ref-filter.c b/ref-filter.c index fd482e9ff20..f83b6f83494 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -2333,16 +2333,11 @@ static void free_array_item(struct ref_array_item *item) free(item); } -/* Free all memory allocated for ref_array */ -void ref_array_clear(struct ref_array *array) +/* Free global memory allocated resource */ +void free_global_resource(void) { int i; - for (i = 0; i < array->nr; i++) - free_array_item(array->items[i]); - FREE_AND_NULL(array->items); - array->nr = array->alloc = 0; - for (i = 0; i < used_atom_cnt; i++) { struct used_atom *atom = &used_atom[i]; if (atom->atom_type == ATOM_HEAD) @@ -2359,6 +2354,17 @@ void ref_array_clear(struct ref_array *array) ref_to_worktree_map.worktrees = NULL; } } +/* Free all memory allocated for ref_array */ +void ref_array_clear(struct ref_array *array) +{ + int i; + + for (i = 0; i < array->nr; i++) + free_array_item(array->items[i]); + FREE_AND_NULL(array->items); + array->nr = array->alloc = 0; + free_global_resource(); +} #define EXCLUDE_REACHED 0 #define INCLUDE_REACHED 1 diff --git a/ref-filter.h b/ref-filter.h index 053980a6a42..ef3d89d73d4 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -112,6 +112,8 @@ struct ref_format { int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type); /* Clear all memory allocated to ref_array */ void ref_array_clear(struct ref_array *array); +/* Free global memory allocated resource */ +void free_global_resource(void); /* Free ref_array_item's value */ void free_ref_array_item_value(struct ref_array_item *item); /* Used to verify if the given format is correct and to parse out the used atoms */ diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh index 95d760652eb..8c1943011fb 100755 --- a/t/t1006-cat-file.sh +++ b/t/t1006-cat-file.sh @@ -679,51 +679,51 @@ batch_test_atom refs/heads/main '%(objectsize)' batch_test_atom refs/heads/main '%(objectsize:disk)' batch_test_atom refs/heads/main '%(deltabase)' batch_test_atom refs/heads/main '%(objectname)' -batch_test_atom refs/heads/main '%(objectname:short)' fail -batch_test_atom refs/heads/main '%(objectname:short=1)' fail -batch_test_atom refs/heads/main '%(objectname:short=10)' fail -batch_test_atom refs/heads/main '%(tree)' fail -batch_test_atom refs/heads/main '%(tree:short)' fail -batch_test_atom refs/heads/main '%(tree:short=1)' fail -batch_test_atom refs/heads/main '%(tree:short=10)' fail -batch_test_atom refs/heads/main '%(parent)' fail -batch_test_atom refs/heads/main '%(parent:short)' fail -batch_test_atom refs/heads/main '%(parent:short=1)' fail -batch_test_atom refs/heads/main '%(parent:short=10)' fail -batch_test_atom refs/heads/main '%(numparent)' fail -batch_test_atom refs/heads/main '%(object)' fail -batch_test_atom refs/heads/main '%(type)' fail -batch_test_atom refs/heads/main '%(raw)' fail -batch_test_atom refs/heads/main '%(*objectname)' fail -batch_test_atom refs/heads/main '%(*objecttype)' fail -batch_test_atom refs/heads/main '%(author)' fail -batch_test_atom refs/heads/main '%(authorname)' fail -batch_test_atom refs/heads/main '%(authoremail)' fail -batch_test_atom refs/heads/main '%(authoremail:trim)' fail -batch_test_atom refs/heads/main '%(authoremail:localpart)' fail -batch_test_atom refs/heads/main '%(authordate)' fail -batch_test_atom refs/heads/main '%(committer)' fail -batch_test_atom refs/heads/main '%(committername)' fail -batch_test_atom refs/heads/main '%(committeremail)' fail -batch_test_atom refs/heads/main '%(committeremail:trim)' fail -batch_test_atom refs/heads/main '%(committeremail:localpart)' fail -batch_test_atom refs/heads/main '%(committerdate)' fail -batch_test_atom refs/heads/main '%(tag)' fail -batch_test_atom refs/heads/main '%(tagger)' fail -batch_test_atom refs/heads/main '%(taggername)' fail -batch_test_atom refs/heads/main '%(taggeremail)' fail -batch_test_atom refs/heads/main '%(taggeremail:trim)' fail -batch_test_atom refs/heads/main '%(taggeremail:localpart)' fail -batch_test_atom refs/heads/main '%(taggerdate)' fail -batch_test_atom refs/heads/main '%(creator)' fail -batch_test_atom refs/heads/main '%(creatordate)' fail -batch_test_atom refs/heads/main '%(subject)' fail -batch_test_atom refs/heads/main '%(subject:sanitize)' fail -batch_test_atom refs/heads/main '%(contents:subject)' fail -batch_test_atom refs/heads/main '%(body)' fail -batch_test_atom refs/heads/main '%(contents:body)' fail -batch_test_atom refs/heads/main '%(contents:signature)' fail -batch_test_atom refs/heads/main '%(contents)' fail +batch_test_atom refs/heads/main '%(objectname:short)' +batch_test_atom refs/heads/main '%(objectname:short=1)' +batch_test_atom refs/heads/main '%(objectname:short=10)' +batch_test_atom refs/heads/main '%(tree)' +batch_test_atom refs/heads/main '%(tree:short)' +batch_test_atom refs/heads/main '%(tree:short=1)' +batch_test_atom refs/heads/main '%(tree:short=10)' +batch_test_atom refs/heads/main '%(parent)' +batch_test_atom refs/heads/main '%(parent:short)' +batch_test_atom refs/heads/main '%(parent:short=1)' +batch_test_atom refs/heads/main '%(parent:short=10)' +batch_test_atom refs/heads/main '%(numparent)' +batch_test_atom refs/heads/main '%(object)' +batch_test_atom refs/heads/main '%(type)' +batch_test_atom refs/heads/main '%(raw)' +batch_test_atom refs/heads/main '%(*objectname)' +batch_test_atom refs/heads/main '%(*objecttype)' +batch_test_atom refs/heads/main '%(author)' +batch_test_atom refs/heads/main '%(authorname)' +batch_test_atom refs/heads/main '%(authoremail)' +batch_test_atom refs/heads/main '%(authoremail:trim)' +batch_test_atom refs/heads/main '%(authoremail:localpart)' +batch_test_atom refs/heads/main '%(authordate)' +batch_test_atom refs/heads/main '%(committer)' +batch_test_atom refs/heads/main '%(committername)' +batch_test_atom refs/heads/main '%(committeremail)' +batch_test_atom refs/heads/main '%(committeremail:trim)' +batch_test_atom refs/heads/main '%(committeremail:localpart)' +batch_test_atom refs/heads/main '%(committerdate)' +batch_test_atom refs/heads/main '%(tag)' +batch_test_atom refs/heads/main '%(tagger)' +batch_test_atom refs/heads/main '%(taggername)' +batch_test_atom refs/heads/main '%(taggeremail)' +batch_test_atom refs/heads/main '%(taggeremail:trim)' +batch_test_atom refs/heads/main '%(taggeremail:localpart)' +batch_test_atom refs/heads/main '%(taggerdate)' +batch_test_atom refs/heads/main '%(creator)' +batch_test_atom refs/heads/main '%(creatordate)' +batch_test_atom refs/heads/main '%(subject)' +batch_test_atom refs/heads/main '%(subject:sanitize)' +batch_test_atom refs/heads/main '%(contents:subject)' +batch_test_atom refs/heads/main '%(body)' +batch_test_atom refs/heads/main '%(contents:body)' +batch_test_atom refs/heads/main '%(contents:signature)' +batch_test_atom refs/heads/main '%(contents)' batch_test_atom refs/heads/main '%(HEAD)' fail batch_test_atom refs/heads/main '%(upstream:track)' fail batch_test_atom refs/heads/main '%(upstream:trackshort)' fail @@ -742,52 +742,52 @@ batch_test_atom refs/tags/testtag '%(push)' fail batch_test_atom refs/tags/testtag '%(objecttype)' batch_test_atom refs/tags/testtag '%(objectsize)' batch_test_atom refs/tags/testtag '%(objectsize:disk)' -batch_test_atom refs/tags/testtag '%(*objectsize:disk)' fail +batch_test_atom refs/tags/testtag '%(*objectsize:disk)' batch_test_atom refs/tags/testtag '%(deltabase)' -batch_test_atom refs/tags/testtag '%(*deltabase)' fail +batch_test_atom refs/tags/testtag '%(*deltabase)' batch_test_atom refs/tags/testtag '%(objectname)' -batch_test_atom refs/tags/testtag '%(objectname:short)' fail -batch_test_atom refs/tags/testtag '%(tree)' fail -batch_test_atom refs/tags/testtag '%(tree:short)' fail -batch_test_atom refs/tags/testtag '%(tree:short=1)' fail -batch_test_atom refs/tags/testtag '%(tree:short=10)' fail -batch_test_atom refs/tags/testtag '%(parent)' fail -batch_test_atom refs/tags/testtag '%(parent:short)' fail -batch_test_atom refs/tags/testtag '%(parent:short=1)' fail -batch_test_atom refs/tags/testtag '%(parent:short=10)' fail -batch_test_atom refs/tags/testtag '%(numparent)' fail -batch_test_atom refs/tags/testtag '%(object)' fail -batch_test_atom refs/tags/testtag '%(type)' fail -batch_test_atom refs/tags/testtag '%(*objectname)' fail -batch_test_atom refs/tags/testtag '%(*objecttype)' fail -batch_test_atom refs/tags/testtag '%(author)' fail -batch_test_atom refs/tags/testtag '%(authorname)' fail -batch_test_atom refs/tags/testtag '%(authoremail)' fail -batch_test_atom refs/tags/testtag '%(authoremail:trim)' fail -batch_test_atom refs/tags/testtag '%(authoremail:localpart)' fail -batch_test_atom refs/tags/testtag '%(authordate)' fail -batch_test_atom refs/tags/testtag '%(committer)' fail -batch_test_atom refs/tags/testtag '%(committername)' fail -batch_test_atom refs/tags/testtag '%(committeremail)' fail -batch_test_atom refs/tags/testtag '%(committeremail:trim)' fail -batch_test_atom refs/tags/testtag '%(committeremail:localpart)' fail -batch_test_atom refs/tags/testtag '%(committerdate)' fail -batch_test_atom refs/tags/testtag '%(tag)' fail -batch_test_atom refs/tags/testtag '%(tagger)' fail -batch_test_atom refs/tags/testtag '%(taggername)' fail -batch_test_atom refs/tags/testtag '%(taggeremail)' fail -batch_test_atom refs/tags/testtag '%(taggeremail:trim)' fail -batch_test_atom refs/tags/testtag '%(taggeremail:localpart)' fail -batch_test_atom refs/tags/testtag '%(taggerdate)' fail -batch_test_atom refs/tags/testtag '%(creator)' fail -batch_test_atom refs/tags/testtag '%(creatordate)' fail -batch_test_atom refs/tags/testtag '%(subject)' fail -batch_test_atom refs/tags/testtag '%(subject:sanitize)' fail -batch_test_atom refs/tags/testtag '%(contents:subject)' fail -batch_test_atom refs/tags/testtag '%(body)' fail -batch_test_atom refs/tags/testtag '%(contents:body)' fail -batch_test_atom refs/tags/testtag '%(contents:signature)' fail -batch_test_atom refs/tags/testtag '%(contents)' fail +batch_test_atom refs/tags/testtag '%(objectname:short)' +batch_test_atom refs/tags/testtag '%(tree)' +batch_test_atom refs/tags/testtag '%(tree:short)' +batch_test_atom refs/tags/testtag '%(tree:short=1)' +batch_test_atom refs/tags/testtag '%(tree:short=10)' +batch_test_atom refs/tags/testtag '%(parent)' +batch_test_atom refs/tags/testtag '%(parent:short)' +batch_test_atom refs/tags/testtag '%(parent:short=1)' +batch_test_atom refs/tags/testtag '%(parent:short=10)' +batch_test_atom refs/tags/testtag '%(numparent)' +batch_test_atom refs/tags/testtag '%(object)' +batch_test_atom refs/tags/testtag '%(type)' +batch_test_atom refs/tags/testtag '%(*objectname)' +batch_test_atom refs/tags/testtag '%(*objecttype)' +batch_test_atom refs/tags/testtag '%(author)' +batch_test_atom refs/tags/testtag '%(authorname)' +batch_test_atom refs/tags/testtag '%(authoremail)' +batch_test_atom refs/tags/testtag '%(authoremail:trim)' +batch_test_atom refs/tags/testtag '%(authoremail:localpart)' +batch_test_atom refs/tags/testtag '%(authordate)' +batch_test_atom refs/tags/testtag '%(committer)' +batch_test_atom refs/tags/testtag '%(committername)' +batch_test_atom refs/tags/testtag '%(committeremail)' +batch_test_atom refs/tags/testtag '%(committeremail:trim)' +batch_test_atom refs/tags/testtag '%(committeremail:localpart)' +batch_test_atom refs/tags/testtag '%(committerdate)' +batch_test_atom refs/tags/testtag '%(tag)' +batch_test_atom refs/tags/testtag '%(tagger)' +batch_test_atom refs/tags/testtag '%(taggername)' +batch_test_atom refs/tags/testtag '%(taggeremail)' +batch_test_atom refs/tags/testtag '%(taggeremail:trim)' +batch_test_atom refs/tags/testtag '%(taggeremail:localpart)' +batch_test_atom refs/tags/testtag '%(taggerdate)' +batch_test_atom refs/tags/testtag '%(creator)' +batch_test_atom refs/tags/testtag '%(creatordate)' +batch_test_atom refs/tags/testtag '%(subject)' +batch_test_atom refs/tags/testtag '%(subject:sanitize)' +batch_test_atom refs/tags/testtag '%(contents:subject)' +batch_test_atom refs/tags/testtag '%(body)' +batch_test_atom refs/tags/testtag '%(contents:body)' +batch_test_atom refs/tags/testtag '%(contents:signature)' +batch_test_atom refs/tags/testtag '%(contents)' batch_test_atom refs/tags/testtag '%(HEAD)' fail batch_test_atom refs/myblobs/blob1 '%(refname)' fail @@ -801,37 +801,50 @@ batch_test_atom refs/myblobs/blob1 '%(objectsize)' batch_test_atom refs/myblobs/blob1 '%(objectsize:disk)' batch_test_atom refs/myblobs/blob1 '%(deltabase)' -batch_test_atom refs/myblobs/blob1 '%(contents)' fail -batch_test_atom refs/myblobs/blob2 '%(contents)' fail +batch_test_atom refs/myblobs/blob1 '%(contents)' +batch_test_atom refs/myblobs/blob2 '%(contents)' -batch_test_atom refs/myblobs/blob1 '%(raw)' fail -batch_test_atom refs/myblobs/blob2 '%(raw)' fail -batch_test_atom refs/mytrees/tree1 '%(raw)' fail +batch_test_atom refs/myblobs/blob1 '%(raw)' +batch_test_atom refs/myblobs/blob2 '%(raw)' +batch_test_atom refs/mytrees/tree1 '%(raw)' -batch_test_atom refs/myblobs/blob1 '%(raw:size)' fail -batch_test_atom refs/myblobs/blob2 '%(raw:size)' fail -batch_test_atom refs/mytrees/tree1 '%(raw:size)' fail +batch_test_atom refs/myblobs/blob1 '%(raw:size)' +batch_test_atom refs/myblobs/blob2 '%(raw:size)' +batch_test_atom refs/mytrees/tree1 '%(raw:size)' -batch_test_atom refs/myblobs/blob1 '%(if:equals=blob)%(objecttype)%(then)commit%(else)not commit%(end)' fail -batch_test_atom refs/myblobs/blob2 '%(if:equals=blob)%(objecttype)%(then)commit%(else)not commit%(end)' fail -batch_test_atom refs/mytrees/tree1 '%(if:equals=tree)%(objecttype)%(then)tree%(else)not tree%(end)' fail +batch_test_atom refs/myblobs/blob1 '%(if:equals=blob)%(objecttype)%(then)commit%(else)not commit%(end)' +batch_test_atom refs/myblobs/blob2 '%(if:equals=blob)%(objecttype)%(then)commit%(else)not commit%(end)' +batch_test_atom refs/mytrees/tree1 '%(if:equals=tree)%(objecttype)%(then)tree%(else)not tree%(end)' -batch_test_atom refs/heads/main '%(align:60) objectname is %(objectname)%(end)|%(objectname)' fail -batch_test_atom refs/heads/main '%(align:left,60) objectname is %(objectname)%(end)|%(objectname)' fail -batch_test_atom refs/heads/main '%(align:middle,60) objectname is %(objectname)%(end)|%(objectname)' fail -batch_test_atom refs/heads/main '%(align:60,right) objectname is %(objectname)%(end)|%(objectname)' fail +batch_test_atom refs/heads/main '%(align:60) objectname is %(objectname)%(end)|%(objectname)' +batch_test_atom refs/heads/main '%(align:left,60) objectname is %(objectname)%(end)|%(objectname)' +batch_test_atom refs/heads/main '%(align:middle,60) objectname is %(objectname)%(end)|%(objectname)' +batch_test_atom refs/heads/main '%(align:60,right) objectname is %(objectname)%(end)|%(objectname)' batch_test_atom refs/heads/main 'VALID' batch_test_atom refs/heads/main '%(INVALID)' fail batch_test_atom refs/heads/main '%(authordate:INVALID)' fail batch_test_atom refs/heads/main '%(objectname) %(objecttype) %(objectsize) -%(raw)' fail +%(raw)' batch_test_atom refs/tags/testtag '%(objectname) %(objecttype) %(objectsize) -%(raw)' fail +%(raw)' batch_test_atom refs/myblobs/blob1 '%(objectname) %(objecttype) %(objectsize) -%(raw)' fail +%(raw)' batch_test_atom refs/myblobs/blob2 '%(objectname) %(objecttype) %(objectsize) -%(raw)' fail +%(raw)' + +test_expect_success 'cat-file --batch equals to --batch-check with atoms' ' + git cat-file --batch-check="%(objectname) %(objecttype) %(objectsize) +%(raw)" >expected <<-EOF && + refs/heads/main + refs/tags/testtag + EOF + git cat-file --batch >actual <<-EOF && + refs/heads/main + refs/tags/testtag + EOF + cmp expected actual +' test_done -- gitgitgadget