From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 06/10] v2writable: localize unindex-range.$EPOCH to $sync state
Date: Wed, 29 May 2019 08:28:56 +0000 [thread overview]
Message-ID: <20190529082900.9312-7-e@80x24.org> (raw)
In-Reply-To: <20190529082900.9312-1-e@80x24.org>
We don't need to stuff that into $self (V2Writable) which can be
longer-lived than a ->index_sync invocation.
---
lib/PublicInbox/V2Writable.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index eef5576..315404c 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -840,7 +840,7 @@ Rewritten history? (in $git->{git_dir})
reindexing $git->{git_dir} starting at
$range
- $self->{"unindex-range.$i"} = "$base..$cur";
+ $sync->{"unindex-range.$i"} = "$base..$cur";
}
$range;
}
@@ -983,7 +983,7 @@ sub index_sync {
-d $git_dir or next; # missing parts are fine
fill_alternates($self, $i);
my $git = PublicInbox::Git->new($git_dir);
- my $unindex = delete $self->{"unindex-range.$i"};
+ my $unindex = delete $sync->{"unindex-range.$i"};
$self->unindex($opts, $git, $unindex) if $unindex;
defined(my $range = $sync->{ranges}->[$i]) or next;
my $fh = $self->{reindex_pipe} = $git->popen(@cmd, $range);
--
EW
next prev parent reply other threads:[~2019-05-29 8:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 8:28 [PATCH 00/10] index: support progress output Eric Wong
2019-05-29 8:28 ` [PATCH 01/10] v2writable: introduce $sync state and put mm_tmp in it Eric Wong
2019-05-29 8:28 ` [PATCH 02/10] v2writable: sync: move delete markers into $sync state Eric Wong
2019-05-29 8:28 ` [PATCH 03/10] v2writable: move {reindex} field to " Eric Wong
2019-05-29 8:28 ` [PATCH 04/10] v2writable: move {regen} into " Eric Wong
2019-05-29 8:28 ` [PATCH 05/10] v2writable: move {ranges} " Eric Wong
2019-05-29 8:28 ` Eric Wong [this message]
2019-05-29 8:28 ` [PATCH 07/10] v2writable: use prototypes for internal subs Eric Wong
2019-05-29 8:28 ` [PATCH 08/10] v2writable: move index_sync options to sync state Eric Wong
2019-05-29 8:28 ` [PATCH 09/10] index: support --verbose option Eric Wong
2019-05-29 8:29 ` [PATCH 10/10] v2writable: show progress updates for index_sync 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: http://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=20190529082900.9312-7-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/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.
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).