foo

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index db0056aa4dcad553704468fe90aac778534a647a..9c59c5c3a4aa7f646a48c75bf771ed642b4011ec 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -461,24 +461,49 @@ sub rcs_update () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub rcs_commit ($$) { #{{{
+sub rcs_prepedit ($) { #{{{
+       # Prepares to edit a file under revision control. Returns a token
+       # that must be passed into rcs_commit when the file is ready
+       # for committing.
+       # 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 : "";
+       }
+} #}}}
+
+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.
        # 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;
        my $file=shift;

+       my $message=shift;
+       my $rcstoken=shift;

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

                }
                }

+

                if (system("svn", "commit", "--quiet", "-m",
                           possibly_foolish_untaint($message),
                           "$config{srcdir}/$file") != 0) {
                if (system("svn", "commit", "--quiet", "-m",
                           possibly_foolish_untaint($message),
                           "$config{srcdir}/$file") != 0) {

-                       warn("svn commit failed\n");

                        my $conflict=readfile("$config{srcdir}/$file");
                        my $conflict=readfile("$config{srcdir}/$file");

-                       if (system("svn", "revert", "$config{srcdir}/$file") != 0) {
+                       if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {

                                warn("svn revert failed\n");
                        }
                        return $conflict;
                                warn("svn revert failed\n");
                        }
                        return $conflict;


@@ -504,6 +529,15 @@ sub rcs_add ($) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub svn_info ($$) { #{{{
+       my $field=shift;
+       my $file=shift;
+
+       my $info=`LANG=C svn info $file`;
+       my ($ret)=$info=~/^$field: (.*)$/m;
+       return $ret;
+} #}}}
+

 sub rcs_recentchanges ($) { #{{{
        my $num=shift;
        my @ret;
 sub rcs_recentchanges ($) { #{{{
        my $num=shift;
        my @ret;


@@ -513,8 +547,7 @@ sub rcs_recentchanges ($) { #{{{
        eval q{use Time::Duration};
        
        if (-d "$config{srcdir}/.svn") {
        eval q{use Time::Duration};
        
        if (-d "$config{srcdir}/.svn") {

-               my $info=`LANG=C svn info $config{srcdir}`;
-               my ($svn_url)=$info=~/^URL: (.*)$/m;
+               my $svn_url=svn_info("URL", $config{srcdir});

 
                # FIXME: currently assumes that the wiki is somewhere
                # under trunk in svn, doesn't support other layouts.
 
                # FIXME: currently assumes that the wiki is somewhere
                # under trunk in svn, doesn't support other layouts.


@@ -1018,7 +1051,7 @@ sub cgi_editpage ($$) { #{{{
 
        eval q{use CGI::FormBuilder};
        my $form = CGI::FormBuilder->new(
 
        eval q{use CGI::FormBuilder};
        my $form = CGI::FormBuilder->new(

-               fields => [qw(do from page content comments)],
+               fields => [qw(do rcsinfo from page content comments)],

                header => 1,
                method => 'POST',
                validate => {
                header => 1,
                method => 'POST',
                validate => {


@@ -1039,13 +1072,29 @@ sub cgi_editpage ($$) { #{{{
                error("bad page name");
        }
        $page=lc($page);
                error("bad page name");
        }
        $page=lc($page);

+       
+       my $file=$page.$config{default_pageext};
+       my $newfile=1;
+       if (exists $pagesources{lc($page)}) {
+               $file=$pagesources{lc($page)};
+               $newfile=0;
+       }

 
        $form->field(name => "do", type => 'hidden');
        $form->field(name => "from", type => 'hidden');
 
        $form->field(name => "do", type => 'hidden');
        $form->field(name => "from", type => 'hidden');

+       $form->field(name => "rcsinfo", type => 'hidden');

        $form->field(name => "page", value => "$page", force => 1);
        $form->field(name => "comments", type => "text", size => 80);
        $form->field(name => "content", type => "textarea", rows => 20,
                cols => 80);
        $form->field(name => "page", value => "$page", force => 1);
        $form->field(name => "comments", type => "text", size => 80);
        $form->field(name => "content", type => "textarea", rows => 20,
                cols => 80);

+       $form->tmpl_param("can_commit", $config{svn});
+       $form->tmpl_param("indexlink", indexlink());
+       $form->tmpl_param("helponformattinglink",
+               htmllink("", "HelpOnFormatting", 1));
+       if (! $form->submitted) {
+               $form->field(name => "rcsinfo", value => rcs_prepedit($file),
+                       force => 1);
+       }

        
        if ($form->submitted eq "Cancel") {
                print $q->redirect("$config{url}/".htmlpage($page));
        
        if ($form->submitted eq "Cancel") {
                print $q->redirect("$config{url}/".htmlpage($page));


@@ -1100,7 +1149,8 @@ sub cgi_editpage ($$) { #{{{
                        $form->title("creating $page");
                }
                elsif ($form->field("do") eq "edit") {
                        $form->title("creating $page");
                }
                elsif ($form->field("do") eq "edit") {

-                       if (! length $form->field('content')) {
+                       if (! defined $form->field('content') || 
+                           ! length $form->field('content')) {

                                my $content="";
                                if (exists $pagesources{lc($page)}) {
                                                $content=readfile("$config{srcdir}/$pagesources{lc($page)}");
                                my $content="";
                                if (exists $pagesources{lc($page)}) {
                                                $content=readfile("$config{srcdir}/$pagesources{lc($page)}");


@@ -1114,19 +1164,10 @@ sub cgi_editpage ($$) { #{{{
                        $form->title("editing $page");
                }
                
                        $form->title("editing $page");
                }
                

-               $form->tmpl_param("can_commit", $config{svn});
-               $form->tmpl_param("indexlink", indexlink());

                print $form->render(submit => \@buttons);
        }
        else {
                # save page
                print $form->render(submit => \@buttons);
        }
        else {
                # save page

-               my $file=$page.$config{default_pageext};
-               my $newfile=1;
-               if (exists $pagesources{lc($page)}) {
-                       $file=$pagesources{lc($page)};
-                       $newfile=0;
-               }
-               

                my $content=$form->field('content');
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                my $content=$form->field('content');
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;


@@ -1152,12 +1193,18 @@ sub cgi_editpage ($$) { #{{{
                        unlockwiki();
                        # presumably the commit will trigger an update
                        # of the wiki
                        unlockwiki();
                        # presumably the commit will trigger an update
                        # of the wiki

-                       my $conflict=rcs_commit($file, $message);
+                       my $conflict=rcs_commit($file, $message,
+                               $form->field("rcsinfo"));

                
                        if (defined $conflict) {
                
                        if (defined $conflict) {

+                               $form->field(name => "rcsinfo", value => rcs_prepedit($file),
+                                       force => 1);

                                $form->tmpl_param("page_conflict", 1);
                                $form->tmpl_param("page_conflict", 1);

-                               $form->field("content", $conflict);
+                               $form->field("content", value => $conflict, force => 1);

                                $form->field("do", "edit)");
                                $form->field("do", "edit)");

+                               $form->tmpl_param("page_select", 0);
+                               $form->field(name => "page", type => 'hidden');
+                               $form->title("editing $page");

                                print $form->render(submit => \@buttons);
                                return;
                        }
                                print $form->render(submit => \@buttons);
                                return;
                        }