From c34a83286234ea1e876ebdf92a33744272bb6f4e Mon Sep 17 00:00:00 2001
From: "Eric Wong (Contractor, The Linux Foundation)" <e@80x24.org>
Date: Sun, 1 Apr 2018 23:15:04 +0000
Subject: v2: one file, really

We need to ensure there is only one file in the top-level tree
at any commit so the "add; remove; add;" sequence on the same
message is detected properly.

Otherwise, git will not detect the second "add" unless
a second message is added to history.

Deletes are now stored in "d" (and not "D" or "_/D") at the
top-level, now.  There's no need to have a "_" to reduce churn
as "m" and "d" should never co-exist.  It's now lowercased to
make it easier-to-distinguish from "D" in git-log output.
---
 t/convert-compact.t   |  6 ++++++
 t/v2-add-remove-add.t | 42 ++++++++++++++++++++++++++++++++++++++++++
 t/v2writable.t        |  7 ++++---
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 t/v2-add-remove-add.t

(limited to 't')

diff --git a/t/convert-compact.t b/t/convert-compact.t
index e51eadcf..92a6a9c5 100644
--- a/t/convert-compact.t
+++ b/t/convert-compact.t
@@ -37,6 +37,8 @@ my $mime = PublicInbox::MIME->create(
 	body => "hello world\n",
 );
 ok($im->add($mime), 'added one message');
+ok($im->remove($mime), 'remove message');
+ok($im->add($mime), 'added message again');
 $im->done;
 PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
 
@@ -77,6 +79,7 @@ $cmd = [ 'public-inbox-compact', "$tmpdir/v2" ];
 my $env = { NPROC => 2 };
 ok(PublicInbox::Import::run_die($cmd, $env, $rdr), 'v2 compact works');
 $ibx->{mainrepo} = "$tmpdir/v2";
+$ibx->{version} = 2;
 my $v2w = PublicInbox::V2Writable->new($ibx);
 is($v2w->{partitions}, 1, "only one partition in compacted repo");
 
@@ -96,5 +99,8 @@ foreach (@xdir) {
 	is($st[2] & 07777, -f _ ? 0444 : 0755,
 		'sharedRepository respected after v2 compact');
 }
+my $res = $ibx->recent({limit => 1000});
+is($res->{msgs}->[0]->{mid}, 'a-mid@b', 'message exists in history');
+is(scalar @{$res->{msgs}}, 1, 'only one message in history');
 
 done_testing();
diff --git a/t/v2-add-remove-add.t b/t/v2-add-remove-add.t
new file mode 100644
index 00000000..b6c58872
--- /dev/null
+++ b/t/v2-add-remove-add.t
@@ -0,0 +1,42 @@
+# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
+use warnings;
+use Test::More;
+use PublicInbox::MIME;
+use File::Temp qw/tempdir/;
+
+foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
+	eval "require $mod";
+	plan skip_all => "$mod missing for v2-add-remove-add.t" if $@;
+}
+use_ok 'PublicInbox::V2Writable';
+my $mainrepo = tempdir('pi-add-remove-add-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $ibx = {
+	mainrepo => "$mainrepo/v2",
+	name => 'test-v2writable',
+	version => 2,
+	-primary_address => 'test@example.com',
+};
+$ibx = PublicInbox::Inbox->new($ibx);
+my $mime = PublicInbox::MIME->create(
+	header => [
+		From => 'a@example.com',
+		To => 'test@example.com',
+		Subject => 'this is a subject',
+		Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
+		'Message-ID' => '<a-mid@b>',
+	],
+	body => "hello world\n",
+);
+my $im = PublicInbox::V2Writable->new($ibx, 1);
+$im->{parallel} = 0;
+ok($im->add($mime), 'message added');
+ok($im->remove($mime), 'message added');
+ok($im->add($mime), 'message added again');
+$im->done;
+my $res = $ibx->recent({limit => 1000});
+is($res->{msgs}->[0]->{mid}, 'a-mid@b', 'message exists in history');
+is(scalar @{$res->{msgs}}, 1, 'only one message in history');
+
+done_testing();
diff --git a/t/v2writable.t b/t/v2writable.t
index 7abb14f6..4a7cfb90 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -210,9 +210,10 @@ EOF
 	my @found = ();
 	$srch->each_smsg_by_mid($smsg->mid, sub { push @found, @_; 1 });
 	is(scalar(@found), 0, 'no longer found in Xapian skeleton');
+	my @log1 = qw(log -1 --pretty=raw --raw -r --no-abbrev --no-renames);
 
-	my $after = $git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev));
-	if ($after =~ m!( [a-f0-9]+ )A\t_/D$!) {
+	my $after = $git0->qx(@log1);
+	if ($after =~ m!( [a-f0-9]+ )A\td$!m) {
 		my $oid = $1;
 		ok(index($before, $oid) > 0, 'no new blob introduced');
 	} else {
@@ -221,7 +222,7 @@ EOF
 	is($im->remove($mime, 'test removal'), undef,
 		'remove is idempotent');
 	$im->done;
-	is($git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev)),
+	is($git0->qx(@log1),
 		$after, 'no git history made with idempotent remove');
 	eval { $im->done };
 	ok(!$@, '->done is idempotent');
-- 
cgit v1.2.3-24-ge0c7