user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 5/7] git: synchronous cat_file may return type and OID
Date: Fri, 29 Jan 2021 12:42:58 +0500	[thread overview]
Message-ID: <20210129074300.14475-6-e@80x24.org> (raw)
In-Reply-To: <20210129074300.14475-1-e@80x24.org>

Instead of forcing callers to set a variable to write into,
we'll just rely on wantarray.
---
 lib/PublicInbox/Git.pm | 9 ++++-----
 t/git.t                | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 3d97300c..c6c1c802 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -240,17 +240,16 @@ sub batch_prepare ($) {
 }
 
 sub _cat_file_cb {
-	my ($bref, undef, undef, $size, $result) = @_;
-	@$result = ($bref, $size);
+	my ($bref, $oid, $type, $size, $result) = @_;
+	@$result = ($bref, $oid, $type, $size);
 }
 
 sub cat_file {
-	my ($self, $oid, $sizeref) = @_;
+	my ($self, $oid) = @_;
 	my $result = [];
 	cat_async($self, $oid, \&_cat_file_cb, $result);
 	cat_async_wait($self);
-	$$sizeref = $result->[1] if $sizeref;
-	$result->[0];
+	wantarray ? @$result : $result->[0];
 }
 
 sub check_async_step ($$) {
diff --git a/t/git.t b/t/git.t
index 377652ca..0c85e492 100644
--- a/t/git.t
+++ b/t/git.t
@@ -70,10 +70,10 @@ if (1) {
 	chomp $buf;
 
 	my $gcf = PublicInbox::Git->new($dir);
-	my $rsize;
-	my $x = $gcf->cat_file($buf, \$rsize);
-	is($rsize, $size, 'got correct size ref on big file');
-	is(length($$x), $size, 'read correct number of bytes');
+	my @x = $gcf->cat_file($buf);
+	is($x[2], 'blob', 'got blob on wantarray');
+	is($x[3], $size, 'got correct size ref on big file');
+	is(length(${$x[0]}), $size, 'read correct number of bytes');
 
 	my $ref = $gcf->qx(qw(cat-file blob), $buf);
 	is($?, 0, 'no error on scalar success');

  parent reply	other threads:[~2021-01-29  7:43 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-29  7:42 [PATCH 0/7] lei: more half-baked updates Eric Wong
2021-01-29  7:42 ` [PATCH 1/7] ipc: wq: support passing fields to workers Eric Wong
2021-01-29  7:42 ` [PATCH 2/7] lei_xsearch: drop repeated "Xapian" in error message Eric Wong
2021-01-29  7:42 ` [PATCH 3/7] ipc: more consistent behavior between worker types Eric Wong
2021-01-29  7:42 ` [PATCH 4/7] lei: less error-prone FD mapping Eric Wong
2021-01-29  7:42 ` Eric Wong [this message]
2021-01-29  7:42 ` [PATCH 6/7] ipc: move on_destroy scope to inside the eval Eric Wong
2021-01-29  7:43 ` [PATCH 7/7] shared_kv: simplify PID+object guard for cleanup Eric Wong

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

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210129074300.14475-6-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    --subject='Re: [PATCH 5/7] git: synchronous cat_file may return type and OID' \
    /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

user/dev discussion of public-inbox itself

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 meta meta/ https://public-inbox.org/meta \
		meta@public-inbox.org
	public-inbox-index meta

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.mail.public-inbox.meta
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.mail.public-inbox.meta
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/public-inbox.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git