svn: Support subversion 1.7, which does not have .svn in each subdirectory.

Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.

The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.

For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.

For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.

tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.

diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index faaf567d578d920bebfda41927c0c7e9946488d0..8824a6ce0a60311cac8ec304258b545e661eea83 100644 (file)
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -122,10 +122,8 @@ sub svn_info ($$) {
 }
 
 sub rcs_update () {
 }
 
 sub rcs_update () {

-       if (-d "$config{srcdir}/.svn") {
-               if (system("svn", "update", "--quiet", $config{srcdir}) != 0) {
-                       warn("svn update failed\n");
-               }
+       if (system("svn", "update", "--quiet", $config{srcdir}) != 0) {
+               warn("svn update failed\n");

        }
 }
 
        }
 }
 


@@ -136,12 +134,10 @@ sub rcs_prepedit ($) {
        # The file is relative to the srcdir.
        my $file=shift;
        
        # The file is relative to the srcdir.
        my $file=shift;
        

-       if (-d "$config{srcdir}/.svn") {
-               # For subversion, return the revision of the file when
-               # editing begins.
-               my $rev=svn_info("Revision", "$config{srcdir}/$file");
-               return defined $rev ? $rev : "";
-       }
+       # For subversion, return the revision of the file when
+       # editing begins.
+       my $rev=svn_info("Revision", "$config{srcdir}/$file");
+       return defined $rev ? $rev : "";

 }
 
 sub commitmessage (@) {
 }
 
 sub commitmessage (@) {


@@ -168,31 +164,30 @@ sub rcs_commit (@) {
        # The file is relative to the srcdir.
        my %params=@_;
 
        # The file is relative to the srcdir.
        my %params=@_;
 

-       if (-d "$config{srcdir}/.svn") {
-               # Check to see if the page has been changed by someone
-               # else since rcs_prepedit was called.
-               my ($oldrev)=$params{token}=~/^([0-9]+)$/; # untaint
-               my $rev=svn_info("Revision", "$config{srcdir}/$params{file}");
-               if (defined $rev && defined $oldrev && $rev != $oldrev) {
-                       # Merge their changes into the file that we've
-                       # changed.
-                       if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
-                                  "$config{srcdir}/$params{file}", "$config{srcdir}/$params{file}") != 0) {
-                               warn("svn merge -r$oldrev:$rev failed\n");
-                       }
+       # Check to see if the page has been changed by someone
+       # else since rcs_prepedit was called.
+       my ($oldrev)=$params{token}=~/^([0-9]+)$/; # untaint
+       my $rev=svn_info("Revision", "$config{srcdir}/$params{file}");
+       if (defined $rev && defined $oldrev && $rev != $oldrev) {
+               # Merge their changes into the file that we've
+               # changed.
+               if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
+                          "$config{srcdir}/$params{file}", "$config{srcdir}/$params{file}") != 0) {
+                       warn("svn merge -r$oldrev:$rev failed\n");

                }
                }

+       }

 
 

-               if (system("svn", "commit", "--quiet", 
-                          "--encoding", "UTF-8", "-m",
-                          IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
-                          $config{srcdir}) != 0) {
-                       my $conflict=readfile("$config{srcdir}/$params{file}");
-                       if (system("svn", "revert", "--quiet", "$config{srcdir}/$params{file}") != 0) {
-                               warn("svn revert failed\n");
-                       }
-                       return $conflict;
+       if (system("svn", "commit", "--quiet", 
+                  "--encoding", "UTF-8", "-m",
+                  IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
+                  $config{srcdir}) != 0) {
+               my $conflict=readfile("$config{srcdir}/$params{file}");
+               if (system("svn", "revert", "--quiet", "$config{srcdir}/$params{file}") != 0) {
+                       warn("svn revert failed\n");

                }
                }

+               return $conflict;

        }
        }

+

        return undef # success
 }
 
        return undef # success
 }
 


@@ -215,16 +210,8 @@ sub rcs_add ($) {
        # filename is relative to the root of the srcdir
        my $file=shift;
 
        # filename is relative to the root of the srcdir
        my $file=shift;
 

-       if (-d "$config{srcdir}/.svn") {
-               my $parent=IkiWiki::dirname($file);
-               while (! -d "$config{srcdir}/$parent/.svn") {
-                       $file=$parent;
-                       $parent=IkiWiki::dirname($file);
-               }
-               
-               if (system("svn", "add", "--quiet", "$config{srcdir}/$file") != 0) {
-                       warn("svn add failed\n");
-               }
+       if (system("svn", "add", "--parents", "--quiet", "$config{srcdir}/$file") != 0) {
+               warn("svn add failed\n");

        }
 }
 
        }
 }
 


@@ -232,10 +219,8 @@ sub rcs_remove ($) {
        # filename is relative to the root of the srcdir
        my $file=shift;
 
        # filename is relative to the root of the srcdir
        my $file=shift;
 

-       if (-d "$config{srcdir}/.svn") {
-               if (system("svn", "rm", "--force", "--quiet", "$config{srcdir}/$file") != 0) {
-                       warn("svn rm failed\n");
-               }
+       if (system("svn", "rm", "--force", "--quiet", "$config{srcdir}/$file") != 0) {
+               warn("svn rm failed\n");

        }
 }
 
        }
 }
 


@@ -243,22 +228,9 @@ sub rcs_rename ($$) {
        # filenames relative to the root of the srcdir
        my ($src, $dest)=@_;
        
        # filenames relative to the root of the srcdir
        my ($src, $dest)=@_;
        

-       if (-d "$config{srcdir}/.svn") {
-               # Add parent directory for $dest
-               my $parent=IkiWiki::dirname($dest);
-               if (! -d "$config{srcdir}/$parent/.svn") {
-                       while (! -d "$config{srcdir}/$parent/.svn") {
-                               $parent=IkiWiki::dirname($dest);
-                       }
-                       if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
-                               warn("svn add $parent failed\n");
-                       }
-               }
-
-               if (system("svn", "mv", "--force", "--quiet", 
-                   "$config{srcdir}/$src", "$config{srcdir}/$dest") != 0) {
-                       warn("svn rename failed\n");
-               }
+       if (system("svn", "mv", "--parents", "--force", "--quiet", 
+           "$config{srcdir}/$src", "$config{srcdir}/$dest") != 0) {
+               warn("svn rename failed\n");

        }
 }
 
        }
 }
 


@@ -266,8 +238,6 @@ sub rcs_recentchanges ($) {
        my $num=shift;
        my @ret;
        
        my $num=shift;
        my @ret;
        

-       return unless -d "$config{srcdir}/.svn";
-

        eval q{
                use Date::Parse;
                use XML::SAX;
        eval q{
                use Date::Parse;
                use XML::SAX;

diff --git a/debian/changelog b/debian/changelog
index d852c6b612f98523012303242cc96f88d0766770..35de8de8b11b877830158ab2ca759656535e9d29 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20110906) UNRELEASED; urgency=low
 
   * searchquery.tmpl: Track escaping change in upstream template.
     Thanks Olly Betts for review.
 
   * searchquery.tmpl: Track escaping change in upstream template.
     Thanks Olly Betts for review.

+  * svn: Support subversion 1.7, which does not have .svn in each
+    subdirectory.

 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Sep 2011 10:47:13 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Sep 2011 10:47:13 -0400