* mercurial: Fix rcs_getctime (thanks, bma)

diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm
index 8a33293959140e7a11bb05c0d2109bb62635df03..a892ee97549ad28244a65b83135772373b0c67a2 100644 (file)
--- a/IkiWiki/Rcs/mercurial.pm
+++ b/IkiWiki/Rcs/mercurial.pm
@@ -160,7 +160,8 @@ sub rcs_getctime ($) { #{{{
 
        # XXX filename passes through the shell here, should try to avoid
        # that just in case
-       my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", '1', $file);
+       my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", '1', 
+               "$config{srcdir}/$file");
        open (my $out, "@cmdline |");
 
        my @log = mercurial_log($out);

diff --git a/debian/changelog b/debian/changelog
index 00f279e7ab7a36f1f6d0536bc1dce3d3b79a3102..8a99a006c5415831510543ad6e0b089726bee0ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ ikiwiki (2.7) UNRELEASED; urgency=low
   * Turn on allow_loose_quotes in the table plugin's Text::CSV object,
     so that links from wikilinks don't confuse the parser.
   * mercurial: Pass --style default to hg log to ensure right format is used.
+  * mercurial: Fix rcs_getctime (thanks, bma)
 
- -- Joey Hess <joeyh@debian.org>  Tue, 28 Aug 2007 22:00:29 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 28 Aug 2007 22:15:52 -0400
 
 ikiwiki (2.6.1) unstable; urgency=low
 

diff --git a/t/mercurial.t b/t/mercurial.t
index 7d6c2eacc3a1daf378ec3b31225629ebb5617c21..da4e2beaa78fc3e46284f8e8b309cbf1d74b9de4 100755 (executable)
--- a/t/mercurial.t
+++ b/t/mercurial.t
@@ -56,10 +56,7 @@ is($changes[0]{pages}[0]{"page"}, "test2.mdwn");
 
 is($changes[1]{pages}[0]{"page"}, "test1.mdwn");
 
-TODO: {
-       local $TODO = "hg behavior change seems to have broken this";
-       my $ctime = IkiWiki::rcs_getctime("test2.mdwn");
-       is($ctime, 0);
-}
+my $ctime = IkiWiki::rcs_getctime("test2.mdwn");
+is($ctime, 0);
 
 system "rm -rf $dir";