Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / darcs.mdwn

diff --git a/doc/todo/darcs.mdwn b/doc/todo/darcs.mdwn
index a410f5ecfad9062c55a2bcb7cc0c9ac0dc5edfc8..882a41379dde48ebebc2dbb4f3c4b524521a4ae1 100644 (file)
--- a/doc/todo/darcs.mdwn
+++ b/doc/todo/darcs.mdwn
@@ -219,14 +219,14 @@ This is my ([bma](bma@bmalee.eu)) darcs.pm - it's messy (my Perl isn't up to muc
        
        package IkiWiki;
        
        
        package IkiWiki;
        

-       sub rcs_update () { #{{{
+       sub rcs_update () {

                # Do nothing - there's nowhere to update *from*.
                # Do nothing - there's nowhere to update *from*.

-       } #}}}
+       }

        
        

-       sub rcs_prepedit ($) { #{{{
-       } #}}}
+       sub rcs_prepedit ($) {
+       }

        
        

-       sub rcs_commit ($$$;$$) { #{{{
+       sub rcs_commit ($$$;$$) {

                my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
        
                # $user should probably be a name and an email address, by darcs
                my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
        
                # $user should probably be a name and an email address, by darcs


@@ -257,16 +257,16 @@ This is my ([bma](bma@bmalee.eu)) darcs.pm - it's messy (my Perl isn't up to muc
        
                return undef; # success
                
        
                return undef; # success
                

-       sub rcs_add ($) { # {{{
+       sub rcs_add ($) {

                my ($file) = @_;
        
                my @cmdline = ("darcs", "add", "--repodir", "$config{srcdir}", "-a", "-q", "$file");
                if (system(@cmdline) != 0) {
                        warn "'@cmdline' failed: $!";
                }
                my ($file) = @_;
        
                my @cmdline = ("darcs", "add", "--repodir", "$config{srcdir}", "-a", "-q", "$file");
                if (system(@cmdline) != 0) {
                        warn "'@cmdline' failed: $!";
                }

-       } #}}}
+       }

        
        

-       sub rcs_recentchanges ($) { #{{{
+       sub rcs_recentchanges ($) {

                # TODO: This is horrible code. It doesn't work perfectly, and uses regexes
                # rather than parsing Darcs' XML output.
                my $num=shift;
                # TODO: This is horrible code. It doesn't work perfectly, and uses regexes
                # rather than parsing Darcs' XML output.
                my $num=shift;


@@ -314,15 +314,15 @@ This is my ([bma](bma@bmalee.eu)) darcs.pm - it's messy (my Perl isn't up to muc
                                }
                }
                return @ret;
                                }
                }
                return @ret;

-       } #}}}
+       }

        
        

-       sub rcs_notify () { #{{{
+       sub rcs_notify () {

                # TODO
                # TODO

-       } #}}}
+       }

        
        

-       sub rcs_getctime ($) { #{{{
+       sub rcs_getctime ($) {

                error gettext("getctime not implemented");
                error gettext("getctime not implemented");

-       } #}}}
+       }

        
        1
 
        
        1
 


@@ -486,11 +486,14 @@ It's got couple of FIXMEs, and a very site-specific filter for recentchanges. No
 
 ---
 
 
 ---
 

-And here's yet another one. :)
+And here's yet another one, including an updated `ikiwiki-makerepo`. :)
+
+<http://khjk.org/~pesco/ikiwiki-darcs/> (now a darcs repo)

 
 

-<http://khjk.org/~pesco/ikiwiki-darcs/>
+> Note that there's a 'darcs' branch in git that I'm keeping a copy of your
+> code in. Just in case. :-)

 
 

-I've taken all the good stuff from the above and added the missing hooks. Some of them I haven't had a chance to test, namely `rcs_rename`, `rcs_remove`, `rcs_commit_staged`, and `rcs_diff`. Also, I'm not experienced with perl and don't know where I should have used the function `possibly_foolish_untaint`.
+I've taken all the good stuff from the above and added the missing hooks. The code hasn't seen a lot of testing, so some bugs are likely yet to surface. Also, I'm not experienced with perl and don't know where I should have used the function `possibly_foolish_untaint`.

 
 Regarding the repository layout: There are two darcs repositories. One is the `srcdir`, the other we'll call `master`.
 
 
 Regarding the repository layout: There are two darcs repositories. One is the `srcdir`, the other we'll call `master`.
 


@@ -523,4 +526,26 @@ Regarding the repository layout: There are two darcs repositories. One is the `s
 > * Is the the darcs info in [[details]] still up-to-date re this version?
 > --[[Joey]]
 
 > * Is the the darcs info in [[details]] still up-to-date re this version?
 > --[[Joey]]
 

+> Update:
+>
+> I think I've addressed all of the above except for the XML parsing in `darcs_info`.
+> The function determines the md5 hash of the last patch the given file appears in.
+> That's indeed being done with regexps but my Perl isn't good enough for a quick recode
+> right now.
+>
+> As for the darcs info in [[rcs/details]], it does not accurately describe the way
+> this version works. It's similar, but the details differ slightly.
+> You could copy my description above to replace it.
+>
+> There is still some ironing to do, for instance the current version doesn't allow for
+> modifying attachments by re-uploading them via CGI ("darcs add failed"). Am I assuming
+> correctly that "adding" a file that's already in the repo should just be a no-op?
+> --pesco
+
+>> It should result in the new file contents being committed by
+>> `rcs_commit_staged`. For some revision control systems, which
+>> automatically commit modifications, it would be a no-op. --[[Joey]]
+
+>>> Done. --pesco
+

 [[!tag patch]]
 [[!tag patch]]