From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Feb 2011 18:11:06 +0000 (-0400)
Subject: Merge remote branch 'smcv/ready/transient-tag'
X-Git-Tag: 3.20110225~78
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8e8311718a0ca4d52aa86a9c8cc439430b11a468?hp=-c

Merge remote branch 'smcv/ready/transient-tag'

Conflicts:
	t/tag.t
---

8e8311718a0ca4d52aa86a9c8cc439430b11a468
diff --combined t/tag.t
index 2d0a6e662,0d360b06e..9f2a8f3ec
--- a/t/tag.t
+++ b/t/tag.t
@@@ -3,7 -3,7 +3,7 @@@ package IkiWiki
  
  use warnings;
  use strict;
- use Test::More tests => 22;
+ use Test::More tests => 23;
  
  BEGIN { use_ok("IkiWiki"); }
  BEGIN { use_ok("IkiWiki::Render"); }
@@@ -22,6 -22,7 +22,7 @@@ $config{wiki_file_chars} = "-[:alnum:]+
  $config{userdir} = "users";
  $config{tagbase} = "tags";
  $config{tag_autocreate} = 1;
+ $config{tag_autocreate_commit} = 0;
  $config{default_pageext} = "mdwn";
  $config{wiki_file_prune_regexps} = [qr/^\./];
  $config{underlaydirbase} = '.';
@@@ -63,25 -64,22 +64,26 @@@ is_deeply([sort keys %autofiles], [qw(t
  ok(!-e "t/tmp/tags/lucky.mdwn");
  my (%pages, @del);
  IkiWiki::gen_autofile("tags/lucky.mdwn", \%pages, \@del);
- is_deeply(\%pages, {"t/tmp/tags/lucky" => 1});
- is_deeply(\@del, []);
- ok(-s "t/tmp/tags/lucky.mdwn");
 -is_deeply(\%pages, {"t/tmp/tags/lucky" => 1}) || diag explain \%pages;
 -is_deeply(\@del, []) || diag explain \@del;
+ ok(! -s "t/tmp/tags/lucky.mdwn");
+ ok(-s "t/tmp/.ikiwiki/transient/tags/lucky.mdwn");
++is_deeply(\%pages, {"t/tmp/tags/lucky" => 1}) || diag explain \%pages;
++is_deeply(\@del, []) || diag explain \@del;
  
  # generating an autofile that already exists does nothing
  %pages = @del = ();
  IkiWiki::gen_autofile("tags/numbers.mdwn", \%pages, \@del);
 -is_deeply(\%pages, {}) || diag explain \%pages;
 -is_deeply(\@del, []) || diag explain \@del;
 +is_deeply(\%pages, {});
 +is_deeply(\@del, []);
  
  # generating an autofile that we just deleted does nothing
  %pages = ();
  @del = ('tags/primes.mdwn');
  IkiWiki::gen_autofile("tags/primes.mdwn", \%pages, \@del);
 -is_deeply(\%pages, {}) || diag explain \%pages;
 -is_deeply(\@del, ['tags/primes.mdwn']) || diag explain \@del;
 +is_deeply(\%pages, {});
 +is_deeply(\@del, ['tags/primes.mdwn']);
 +
 +
 +# cleanup
 +ok(! system("rm -rf t/tmp"));
  
  1;