first cut at svn merge and conflict

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index fd9904e3daf9e6c682baf61f51239b7c2dc5d46e..db0056aa4dcad553704468fe90aac778534a647a 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -420,6 +420,10 @@ sub lockwiki () { #{{{
        }
 } #}}}
 
+sub unlockwiki () { #{{{
+       close WIKILOCK;
+} #}}}
+
 sub loadindex () { #{{{
        open (IN, "$config{srcdir}/.ikiwiki/index") || return;
        while (<IN>) {
@@ -457,19 +461,34 @@ sub rcs_update () { #{{{
        }
 } #}}}
 
-sub rcs_commit ($) { #{{{
+sub rcs_commit ($$) { #{{{
+       # Tries to commit the page; returns undef on _success_ and
+       # a version of the page with the rcs's conflict markers on failure.
+       # The file is relative to the srcdir.
        my $message=shift;
+       my $file=shift;
 
        if (-d "$config{srcdir}/.svn") {
+               # svn up to let svn merge in other changes
+               if (system("svn", "update", "$config{srcdir}/$file") != 0) {
+                       warn("svn update failed\n");
+               }
                if (system("svn", "commit", "--quiet", "-m",
                           possibly_foolish_untaint($message),
-                          $config{srcdir}) != 0) {
+                          "$config{srcdir}/$file") != 0) {
                        warn("svn commit failed\n");
+                       my $conflict=readfile("$config{srcdir}/$file");
+                       if (system("svn", "revert", "$config{srcdir}/$file") != 0) {
+                               warn("svn revert failed\n");
+                       }
+                       return $conflict;
                }
        }
+       return undef # success
 } #}}}
 
 sub rcs_add ($) { #{{{
+       # filename is relative to the root of the srcdir
        my $file=shift;
 
        if (-d "$config{srcdir}/.svn") {
@@ -564,10 +583,9 @@ sub prune ($) { #{{{
 } #}}}
 
 sub refresh () { #{{{
-       # Find existing pages.
+       # find existing pages
        my %exists;
        my @files;
-       
        eval q{use File::Find};
        find({
                no_chdir => 1,
@@ -608,7 +626,7 @@ sub refresh () { #{{{
        foreach my $page (keys %oldpagemtime) {
                if (! $exists{$page}) {
                        debug("removing old page $page");
-                       push @del, $renderedfiles{$page};
+                       push @del, $pagesources{$page};
                        prune($config{destdir}."/".$renderedfiles{$page});
                        delete $renderedfiles{$page};
                        $oldpagemtime{$page}=0;
@@ -1013,6 +1031,7 @@ sub cgi_editpage ($$) { #{{{
                table => 0,
                template => "$config{templatedir}/editpage.tmpl"
        );
+       my @buttons=("Save Page", "Preview", "Cancel");
        
        my ($page)=$form->param('page')=~/$config{wiki_file_regexp}/;
        if (! defined $page || ! length $page || $page ne $q->param('page') ||
@@ -1040,6 +1059,7 @@ sub cgi_editpage ($$) { #{{{
        else {
                $form->tmpl_param("page_preview", "");
        }
+       $form->tmpl_param("page_conflict", "");
        
        if (! $form->submitted || $form->submitted eq "Preview" || 
            ! $form->validate) {
@@ -1096,7 +1116,7 @@ sub cgi_editpage ($$) { #{{{
                
                $form->tmpl_param("can_commit", $config{svn});
                $form->tmpl_param("indexlink", indexlink());
-               print $form->render(submit => ["Save Page", "Preview", "Cancel"]);
+               print $form->render(submit => \@buttons);
        }
        else {
                # save page
@@ -1128,9 +1148,19 @@ sub cgi_editpage ($$) { #{{{
                        if ($newfile) {
                                rcs_add($file);
                        }
+                       # prevent deadlock with post-commit hook
+                       unlockwiki();
                        # presumably the commit will trigger an update
                        # of the wiki
-                       rcs_commit($message);
+                       my $conflict=rcs_commit($file, $message);
+               
+                       if (defined $conflict) {
+                               $form->tmpl_param("page_conflict", 1);
+                               $form->field("content", $conflict);
+                               $form->field("do", "edit)");
+                               print $form->render(submit => \@buttons);
+                               return;
+                       }
                }
                else {
                        loadindex();