about summary refs log tree commit homepage
path: root/lib/PublicInbox/V2Writable.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-05-28 23:48:48 +0000
committerEric Wong <e@80x24.org>2019-05-29 08:04:41 +0000
commit44f67bc8905fd9dcf331fd02012c2bb89c5d2680 (patch)
tree7166a6cebc0170ee1b0f4d3c938e0c53c3c07655 /lib/PublicInbox/V2Writable.pm
parent0030b821dd58a11363691f1158924634b9e36198 (diff)
downloadpublic-inbox-44f67bc8905fd9dcf331fd02012c2bb89c5d2680.tar.gz
Yet another temporary variable with no use outside of index_sync.
Diffstat (limited to 'lib/PublicInbox/V2Writable.pm')
-rw-r--r--lib/PublicInbox/V2Writable.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index e341d93f..eef5576c 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -813,14 +813,14 @@ sub last_commits {
 
 # returns a revision range for git-log(1)
 sub log_range ($$$$$) {
-        my ($self, $git, $ranges, $i, $tip) = @_;
-        my $cur = $ranges->[$i] or return $tip; # all of it
+        my ($self, $sync, $git, $i, $tip) = @_;
+        my $cur = $sync->{ranges}->[$i] or return $tip; # all of it
         my $range = "$cur..$tip";
         if (is_ancestor($git, $cur, $tip)) { # common case
                 my $n = $git->qx(qw(rev-list --count), $range);
                 chomp($n);
                 if ($n == 0) {
-                        $ranges->[$i] = undef;
+                        $sync->{ranges}->[$i] = undef;
                         return; # nothing to do
                 }
         } else {
@@ -846,7 +846,7 @@ $range
 }
 
 sub sync_prepare {
-        my ($self, $opts, $epoch_max, $ranges) = @_;
+        my ($self, $sync, $opts, $epoch_max) = @_;
         my $pr = $opts->{-progress};
         my $regen_max = 0;
         my $head = $self->{-inbox}->{ref_head} || 'refs/heads/master';
@@ -866,8 +866,8 @@ sub sync_prepare {
                 chomp(my $tip = $git->qx(qw(rev-parse -q --verify), $head));
 
                 next if $?; # new repo
-                my $range = log_range($self, $git, $ranges, $i, $tip) or next;
-                $ranges->[$i] = $range;
+                my $range = log_range($self, $sync, $git, $i, $tip) or next;
+                $sync->{ranges}->[$i] = $range;
 
                 # can't use 'rev-list --count' if we use --diff-filter
                 $pr->("$i.git counting changes\n\t$range ... ") if $pr;
@@ -970,8 +970,8 @@ sub index_sync {
                 D => {}, # "$mid\0$cid" => $oid
                 reindex => $opts->{reindex},
         };
-        my $ranges = sync_ranges($self, $sync, $epoch_max);
-        $sync->{regen} = sync_prepare($self, $opts, $epoch_max, $ranges);
+        $sync->{ranges} = sync_ranges($self, $sync, $epoch_max);
+        $sync->{regen} = sync_prepare($self, $sync, $opts, $epoch_max);
 
         my @cmd = qw(log --raw -r --pretty=tformat:%H
                         --no-notes --no-color --no-abbrev --no-renames);
@@ -985,7 +985,7 @@ sub index_sync {
                 my $git = PublicInbox::Git->new($git_dir);
                 my $unindex = delete $self->{"unindex-range.$i"};
                 $self->unindex($opts, $git, $unindex) if $unindex;
-                defined(my $range = $ranges->[$i]) or next;
+                defined(my $range = $sync->{ranges}->[$i]) or next;
                 my $fh = $self->{reindex_pipe} = $git->popen(@cmd, $range);
                 my $cmt;
                 while (<$fh>) {