* [PATCH 1/2] import: hoist out common run_die subroutine
2016-09-08 22:46 6% [PATCH 0/2] import: run "git gc --auto" Eric Wong
@ 2016-09-08 22:46 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-09-08 22:46 UTC (permalink / raw)
To: meta
We will be reusing this in the next commit, too.
---
lib/PublicInbox/Import.pm | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 09dd38d..083fb1b 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -204,6 +204,14 @@ sub add {
$self->{tip} = ":$commit";
}
+sub run_die ($$) {
+ my ($cmd, $env) = @_;
+ my $pid = spawn($cmd, $env, undef);
+ defined $pid or die "spawning ".join(' ', @$cmd)." failed: $!";
+ waitpid($pid, 0) == $pid or die join(' ', @$cmd) .' did not finish';
+ $? == 0 or die join(' ', @$cmd) . " failed: $?\n";
+}
+
sub done {
my ($self) = @_;
my $w = delete $self->{out} or return;
@@ -222,19 +230,10 @@ sub done {
if ($nchg && !$ENV{FAST}) {
my $index = "$git_dir/ssoma.index";
my $env = { GIT_INDEX_FILE => $index };
- my @rt = (@cmd, qw(read-tree -m -v -i), $self->{ref});
- $pid = spawn(\@rt, $env, undef);
- defined $pid or die "spawn read-tree failed: $!";
- waitpid($pid, 0) == $pid or die 'read-tree did not finish';
- $? == 0 or die "failed to update $git_dir/ssoma.index: $?\n";
+ run_die([@cmd, qw(read-tree -m -v -i), $self->{ref}], $env);
}
if ($nchg) {
- $pid = spawn([@cmd, 'update-server-info'], undef, undef);
- defined $pid or die "spawn update-server-info failed: $!\n";
- waitpid($pid, 0) == $pid or
- die 'update-server-info did not finish';
- $? == 0 or die "failed to update-server-info: $?\n";
-
+ run_die([@cmd, 'update-server-info'], undef);
eval {
require PublicInbox::SearchIdx;
my $inbox = $self->{inbox} || $git_dir;
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] import: run "git gc --auto"
@ 2016-09-08 22:46 6% Eric Wong
2016-09-08 22:46 7% ` [PATCH 1/2] import: hoist out common run_die subroutine Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2016-09-08 22:46 UTC (permalink / raw)
To: meta
This change is way overdue :x Better late than never, I guess.
Eric Wong (2):
import: hoist out common run_die subroutine
import: run "git gc --auto" when done
lib/PublicInbox/Import.pm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-09-08 22:46 6% [PATCH 0/2] import: run "git gc --auto" Eric Wong
2016-09-08 22:46 7% ` [PATCH 1/2] import: hoist out common run_die subroutine Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).