* Apply patch from hb that uses the full path to a file when adding a file

  using the mercurial backend. Not 100% sure why it failed w/o the full
  path, but this still passes the test suite, and indeed, is how the test
  suite calls hg add.

diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm
index 2e15085ecca097c518b3525297833a10ada82c99..3a75b40c5bbdc564877f48fc87e2a2fdc3207334 100644 (file)
--- a/IkiWiki/Rcs/mercurial.pm
+++ b/IkiWiki/Rcs/mercurial.pm
@@ -95,7 +95,7 @@ sub rcs_commit ($$$;$$) { #{{{
 sub rcs_add ($) { # {{{
        my ($file) = @_;
 
 sub rcs_add ($) { # {{{
        my ($file) = @_;
 

-       my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "add", "$file");
+       my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "add", "$config{srcdir}/$file");

        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }

diff --git a/debian/changelog b/debian/changelog
index 22de088545c1dc097daf37a8bb945b51c4fc81bf..1a14021c4166b9b6d0f51ce1f853f27f8c38db5a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,8 +44,12 @@ ikiwiki (1.51) UNRELEASED; urgency=low
   * Updated Polish translation from Pawel Tecza.
   * Updated Czech translation from Miroslav Kure.
   * Updated Spanish translation from Victor Moral.
   * Updated Polish translation from Pawel Tecza.
   * Updated Czech translation from Miroslav Kure.
   * Updated Spanish translation from Victor Moral.

+  * Apply patch from hb that uses the full path to a file when adding a file
+    using the mercurial backend. Not 100% sure why it failed w/o the full
+    path, but this still passes the test suite, and indeed, is how the test
+    suite calls hg add.

 
 

- -- Joey Hess <joeyh@debian.org>  Sat, 28 Apr 2007 22:47:38 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 28 Apr 2007 23:51:35 -0400

 
 ikiwiki (1.50) unstable; urgency=low
 
 
 ikiwiki (1.50) unstable; urgency=low
 

diff --git a/doc/patchqueue/mercurial_fail_to_add.mdwn b/doc/bugs/mercurial_fail_to_add.mdwn
similarity index 71%
rename from doc/patchqueue/mercurial_fail_to_add.mdwn
rename to doc/bugs/mercurial_fail_to_add.mdwn
index 86ee6ab15d2140692abc7a97f539d67c01d07de5..d47960e9bfbe5699d7fe91bb5eb55607a6bb6d9a 100644 (file)
--- a/doc/patchqueue/mercurial_fail_to_add.mdwn
+++ b/doc/bugs/mercurial_fail_to_add.mdwn
@@ -16,3 +16,11 @@ Here is a patch that's seems to work, although I'm not quite sure what's wrong w
            }
 
 My srcdir path has some symbolics links and hidden directorys... maybe that's it ?
            }
 
 My srcdir path has some symbolics links and hidden directorys... maybe that's it ?

+
+> Interesting, the mercurial test suite shows the add without the path
+> working ok. OTOH, it also continues to work if I apply your patch, so I
+> guess it's safe enough. It would be good to know why it's failing w/o the
+> path in your case. --[[Joey]]
+
+> As I applied the patch, I'm moving this out of the patchqueue to bugs and
+> marking it [[done]]. --[[Joey]]