From: Eric Wong <e@80x24.org>
Date: Sun, 16 Jun 2019 01:04:28 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/newspeak' into xcpdb
X-Git-Tag: v1.2.0~165
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=c477bdd8a80eecc319b680764edfb24bd12cb7b2;hp=-c

Merge remote-tracking branch 'origin/newspeak' into xcpdb

* origin/newspeak:
  comments: replace "partition" with "shard"
  t/xcpdb-reshard: use 'shard' term in local variables
  xapcmd: favor 'shard' over 'part' in local variables
  search: use "shard" for local variable
  v2writable: use "epoch" consistently when referring to git repos
  adminedit: "part" => "shard" for local variables
  v2writable: rename local vars to match Xapian terminology
  v2writable: avoid "part" in internal subs and fields
  search*: rename {partition} => {shard}
  xapcmd: update comments referencing "partitions"
  v2: rename SearchIdxPart => SearchIdxShard
  inboxwritable: s/partitions/shards/ in local var
  tests: change messages to use "shard" instead of partition
  v2writable: rename {partitions} field to {shards}
  v2writable: count_partitions => count_shards
  searchidxpart: start using "shard" in user-visible places
  rename reference to git epochs as "partitions"
  admin|xapcmd: user-facing messages say "shard"
  v2writable: update comments regarding xcpdb --reshard
  doc: rename our Xapian "partitions" to "shards"
---

c477bdd8a80eecc319b680764edfb24bd12cb7b2
diff --combined t/psgi_v2.t
index b8062de2,36010689..a84566d9
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@@ -155,7 -155,7 +155,7 @@@ test_psgi(sub { $www->call(@_) }, sub 
  	$res = $cb->(GET('/v2test/?q=m:a-mid@b&x=t'));
  	is($res->code, 200, 'success with threaded search');
  	my $raw = $res->content;
 -	ok($raw =~ s/\A.*>Results 1-3 of 3<//s, 'got all results');
 +	ok($raw =~ s/\A.*>Results 1-3 of 3\b//s, 'got all results');
  	my @over = ($raw =~ m/\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm);
  	is_deeply(\@over, [ '<a', '` <a', '` <a' ], 'threaded messages show up');
  
@@@ -205,7 -205,7 +205,7 @@@
  	$res = $cb->(GET('/v2test/0.git/info/refs'));
  	is($res->code, 200, 'got info refs for dumb clones w/ .git suffix');
  	$res = $cb->(GET('/v2test/info/refs'));
- 	is($res->code, 404, 'unpartitioned git URL fails');
+ 	is($res->code, 404, 'v2 git URL w/o shard fails');
  
  	# ensure conflicted attachments can be resolved
  	foreach my $body (qw(old new)) {