From: Christian Couder <christian.couder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH v3 4/4] ref-filter: add support for %(contents:size)
Date: Thu, 9 Jul 2020 10:10:29 +0200 [thread overview]
Message-ID: <CAP8UFD2tUUgwjhkizihhqHc0LUYN_gS=wZCtXroLVtT3kMyqLw@mail.gmail.com> (raw)
In-Reply-To: <xmqqtuyhzgro.fsf@gitster.c.googlers.com>
On Thu, Jul 9, 2020 at 2:14 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Junio C Hamano <gitster@pobox.com> writes:
>
> > Of course, we _could_ update the test_atom to do something magic
> > only when the 'contents' atom is being asked. We notice that $2 is
> > 'contents', do the usual test_expect_success for 'contents', and
> > then measure the byte length of $3 ourselves and test
> > 'contents:size'. That way, all the above test updates would become
> > unnecessary (and the last two hunks of this patch can also go).
> >
> > That approach may even allow you to hide the details of sanitize-pgp
> > in the updated test_atom so that the actual tests may not have to get
> > updated even for signed tags.
>
> After seeing the "wc -c" portability issues, I am now even more
> inclined to say that the above is the right direction. The
> portability worries can and should be encapsulated in a single
> test_atom helper function, just as it can be used to hide the
> differences between signed tags, annotated tags and commits.
Yeah, I have been working on that and will send a new patch series soon.
The current test_atom() change looks like this:
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 371e45e5ad..e514d98574 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -52,6 +52,26 @@ test_atom() {
sanitize_pgp <actual >actual.clean &&
test_cmp expected actual.clean
"
+ # Automatically test "contents:size" atom after testing "contents"
+ if test "$2" = "contents"
+ then
+ case "$1" in
+ refs/tags/signed-*)
+ # We cannot use $3 as it expects sanitize_pgp to run
+ git cat-file tag $ref | tail -n +6 | \
+ wc -c | sed -e 's/^ *//' >expected ;;
+ refs/mytrees/*)
+ echo >expected ;;
+ refs/myblobs/*)
+ echo >expected ;;
+ *)
+ printf '%s' "$3" | wc -c | sed -e 's/^ *//' >expected ;;
+ esac
+ test_expect_${4:-success} $PREREQ "basic atom: $1 $2:size" "
+ git for-each-ref --format='%($2:size)' $ref >actual &&
+ test_cmp expected actual
+ "
+ fi
}
I am wondering if it's worth adding a preparatory patch to introduce
an helper function like the following in test-lib-functions.sh:
+# test_byte_count outputs the number of bytes in files or stdin
+#
+# It is like wc -c but without portability issues, as on macOS and
+# possibly other platforms leading whitespaces are emitted before the
+# number.
+
+test_byte_count () {
+ wc -c "$@" | sed -e 's/^ *//'
+}
Not sure about the name of this helper function as it works
differently than test_line_count().
next prev parent reply other threads:[~2020-07-09 8:10 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 17:40 [PATCH v3 0/4] Add support for %(contents:size) in ref-filter Christian Couder
2020-07-07 17:40 ` [PATCH v3 1/4] Documentation: clarify %(contents:XXXX) doc Christian Couder
2020-07-07 19:26 ` Junio C Hamano
2020-07-10 16:47 ` Christian Couder
2020-07-07 17:40 ` [PATCH v3 2/4] Documentation: clarify 'complete message' Christian Couder
2020-07-07 19:19 ` Junio C Hamano
2020-07-07 17:40 ` [PATCH v3 3/4] t6300: test refs pointing to tree and blob Christian Couder
2020-07-07 19:32 ` Junio C Hamano
2020-07-07 17:40 ` [PATCH v3 4/4] ref-filter: add support for %(contents:size) Christian Couder
2020-07-07 19:45 ` Junio C Hamano
2020-07-09 0:14 ` Junio C Hamano
2020-07-09 8:10 ` Christian Couder [this message]
2020-07-09 13:47 ` Junio C Hamano
2020-07-07 22:21 ` Junio C Hamano
2020-07-08 23:05 ` Junio C Hamano
2020-07-10 16:47 ` [PATCH v4 0/3] Add support for %(contents:size) in ref-filter Christian Couder
2020-07-10 16:47 ` [PATCH v4 1/3] Documentation: clarify %(contents:XXXX) doc Christian Couder
2020-07-10 20:24 ` Junio C Hamano
2020-07-10 16:47 ` [PATCH v4 2/3] t6300: test refs pointing to tree and blob Christian Couder
2020-07-10 20:24 ` Junio C Hamano
2020-07-10 16:47 ` [PATCH v4 3/3] ref-filter: add support for %(contents:size) Christian Couder
2020-07-10 20:38 ` Junio C Hamano
2020-07-16 12:19 ` [PATCH v5 0/3] Add support for %(contents:size) in ref-filter Christian Couder
2020-07-16 12:19 ` [PATCH v5 1/3] Documentation: clarify %(contents:XXXX) doc Christian Couder
2020-07-16 12:19 ` [PATCH v5 2/3] t6300: test refs pointing to tree and blob Christian Couder
2020-07-16 12:19 ` [PATCH v5 3/3] ref-filter: add support for %(contents:size) Christian Couder
2020-07-31 17:37 ` Alban Gruin
2020-07-31 17:45 ` [PATCH v1] t6300: fix issues related to %(contents:size) Alban Gruin
2020-07-31 17:47 ` Jeff King
2020-07-31 18:24 ` Alban Gruin
2020-07-31 20:04 ` Junio C Hamano
2020-07-31 20:30 ` Jeff King
2020-07-31 18:26 ` [PATCH v2] " Alban Gruin
2020-07-31 19:15 ` Jeff King
2020-07-31 17:45 ` [PATCH v5 3/3] ref-filter: add support for %(contents:size) Jeff King
2020-07-31 20:12 ` Christian Couder
2020-07-31 20:30 ` Junio C Hamano
2020-07-31 20:40 ` Jeff King
2020-07-16 17:48 ` [PATCH v5 0/3] Add support for %(contents:size) in ref-filter Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAP8UFD2tUUgwjhkizihhqHc0LUYN_gS=wZCtXroLVtT3kMyqLw@mail.gmail.com' \
--to=christian.couder@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).