2 package IkiWiki::Plugin::cvs;
9 hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
10 hook(type => "getsetup", id => "cvs", call => \&getsetup);
11 hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
12 hook(type => "rcs", id => "rcs_prepedit", call => \&rcs_prepedit);
13 hook(type => "rcs", id => "rcs_commit", call => \&rcs_commit);
14 hook(type => "rcs", id => "rcs_commit_staged", call => \&rcs_commit_staged);
15 hook(type => "rcs", id => "rcs_add", call => \&rcs_add);
16 hook(type => "rcs", id => "rcs_remove", call => \&rcs_remove);
17 hook(type => "rcs", id => "rcs_rename", call => \&rcs_rename);
18 hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
19 hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
20 hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
24 if (! defined $config{cvspath}) {
25 $config{cvspath}="ikiwiki";
27 if (exists $config{cvspath}) {
28 # code depends on the path not having extraneous slashes
29 $config{cvspath}=~tr#/#/#s;
30 $config{cvspath}=~s/\/$//;
31 $config{cvspath}=~s/^\///;
33 if (defined $config{cvs_wrapper} && length $config{cvs_wrapper}) {
34 push @{$config{wrappers}}, {
35 wrapper => $config{cvs_wrapper},
36 wrappermode => (defined $config{cvs_wrappermode} ? $config{cvs_wrappermode} : "04755"),
44 safe => 0, # rcs plugin
49 example => "/cvs/wikirepo",
50 description => "cvs repository location",
57 description => "path inside repository where the wiki is located",
63 example => "/cvs/wikirepo/CVSROOT/post-commit",
64 description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry",
71 description => "mode for cvs_wrapper (can safely be made suid)",
77 example => "http://cvs.example.org/cvsweb.cgi/ikiwiki/[[file]]",
78 description => "cvsweb url to show file history ([[file]] substituted)",
84 example => "http://cvs.example.org/cvsweb.cgi/ikiwiki/[[file]].diff?r1=text&tr1=[[r1]]&r2=text&tr2=[[r2]]",
85 description => "cvsweb url to show a diff ([[file]], [[r1]], and [[r2]] substituted)",
95 chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
97 my $info=`cvs status $file`;
98 my ($ret)=$info=~/^\s*$field:\s*(\S+)/m;
104 unshift @$cmd, 'cvs', '-Q';
111 chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
113 debug("runcvs: " . join(" ", @$cmd));
115 my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
116 IPC::Cmd::run(command => $cmd, verbose => 0);
118 warn(join(" ", @$cmd) . " exited with code $error_code\n");
119 warn(join "", @$stderr_buf);
124 sub cvs_shquote_commit ($) {
128 use String::ShellQuote;
132 return shell_quote(IkiWiki::possibly_foolish_untaint($message));
135 sub cvs_is_controlling {
137 $dir=$config{srcdir} unless defined($dir);
138 return (-d "$dir/CVS") ? 1 : 0;
142 return unless cvs_is_controlling;
143 cvs_runcvs(['update', '-dP']);
146 sub rcs_prepedit ($) {
147 # Prepares to edit a file under revision control. Returns a token
148 # that must be passed into rcs_commit when the file is ready
150 # The file is relative to the srcdir.
153 return unless cvs_is_controlling;
155 # For cvs, return the revision of the file when
157 my $rev=cvs_info("Repository revision", "$file");
158 return defined $rev ? $rev : "";
161 sub rcs_commit ($$$;$$) {
162 # Tries to commit the page; returns undef on _success_ and
163 # a version of the page with the rcs's conflict markers on failure.
164 # The file is relative to the srcdir.
171 return unless cvs_is_controlling;
174 $message="web commit by $user".(length $message ? ": $message" : "");
176 elsif (defined $ipaddr) {
177 $message="web commit from $ipaddr".(length $message ? ": $message" : "");
180 # Check to see if the page has been changed by someone
181 # else since rcs_prepedit was called.
182 my ($oldrev)=$rcstoken=~/^([0-9]+)$/; # untaint
183 my $rev=cvs_info("Repository revision", "$config{srcdir}/$file");
184 if (defined $rev && defined $oldrev && $rev != $oldrev) {
185 # Merge their changes into the file that we've
187 cvs_runcvs(['update', $file]) ||
188 warn("cvs merge from $oldrev to $rev failed\n");
191 if (! cvs_runcvs(['commit', '-m', cvs_shquote_commit $message])) {
192 my $conflict=readfile("$config{srcdir}/$file");
193 cvs_runcvs(['update', '-C', $file]) ||
194 warn("cvs revert failed\n");
198 return undef # success
201 sub rcs_commit_staged ($$$) {
202 # Commits all staged changes. Changes can be staged using rcs_add,
203 # rcs_remove, and rcs_rename.
204 my ($message, $user, $ipaddr)=@_;
207 $message="web commit by $user".(length $message ? ": $message" : "");
209 elsif (defined $ipaddr) {
210 $message="web commit from $ipaddr".(length $message ? ": $message" : "");
213 if (! cvs_runcvs(['commit', '-m', cvs_shquote_commit $message])) {
214 warn "cvs staged commit failed\n";
217 return undef # success
221 # filename is relative to the root of the srcdir
223 my $parent=IkiWiki::dirname($file);
224 my @files_to_add = ($file);
226 until ((length($parent) == 0) || cvs_is_controlling("$config{srcdir}/$parent")){
227 push @files_to_add, $parent;
228 $parent = IkiWiki::dirname($parent);
231 while ($file = pop @files_to_add) {
232 cvs_runcvs(['add', $file]) ||
233 warn("cvs add $file failed\n");
238 # filename is relative to the root of the srcdir
241 return unless cvs_is_controlling;
243 cvs_runcvs(['rm', '-f', $file]) ||
244 warn("cvs rm $file failed\n");
247 sub rcs_rename ($$) {
248 # filenames relative to the root of the srcdir
251 return unless cvs_is_controlling;
253 chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
255 if (system("mv", "$src", "$dest") != 0) {
256 warn("filesystem rename failed\n");
263 sub rcs_recentchanges($) {
267 return unless cvs_is_controlling;
274 chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
276 open CVSPS, "env TZ=UTC cvsps -q --cvs-direct -z 30 -x |" || error "couldn't get cvsps output: $!\n";
277 my @spsvc = reverse <CVSPS>; # is this great? no it is not
278 close CVSPS || error "couldn't close cvsps output: $!\n";
280 while (my $line = shift @spsvc) {
281 $line =~ /^$/ || error "expected blank line, got $line";
283 my ($rev, $user, $committype, $when);
284 my (@message, @pages);
286 # We're reading backwards.
287 # Forwards, an entry looks like so:
288 # ---------------------
291 # Author: $user (or user CGI runs as, for web commits)
297 # @pages (and revisions)
300 while ($line = shift @spsvc) {
301 last if ($line =~ /^Members:/);
306 my ($page, $revs) = split(/:/, $line);
307 my ($oldrev, $newrev) = split(/->/, $revs);
308 $oldrev =~ s/INITIAL/0/;
309 $newrev =~ s/\(DEAD\)//;
310 my $diffurl = defined $config{diffurl} ? $config{diffurl} : "";
311 $diffurl=~s/\[\[file\]\]/$page/g;
312 $diffurl=~s/\[\[r1\]\]/$oldrev/g;
313 $diffurl=~s/\[\[r2\]\]/$newrev/g;
315 page => pagename($page),
320 while ($line = shift @spsvc) {
321 last if ($line =~ /^Log:$/);
323 unshift @message, { line => $line };
326 if (defined $message[0] &&
327 $message[0]->{line}=~/$config{web_commit_regexp}/) {
328 $user=defined $2 ? "$2" : "$3";
329 $message[0]->{line}=$4;
334 $line = shift @spsvc; # Tag
335 $line = shift @spsvc; # Branch
337 $line = shift @spsvc;
338 if ($line =~ /^Author: (.*)$/) {
339 $user = $1 unless defined $user && length $user;
341 error "expected Author, got $line";
344 $line = shift @spsvc;
345 if ($line =~ /^Date: (.*)$/) {
346 $when = str2time($1, 'UTC');
348 error "expected Date, got $line";
351 $line = shift @spsvc;
352 if ($line =~ /^PatchSet (.*)$/) {
355 error "expected PatchSet, got $line";
358 $line = shift @spsvc; # ---------------------
363 committype => $committype,
365 message => [@message],
368 return @ret if @ret >= $num;
375 my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
377 chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
379 # diff output is unavoidably preceded by the cvsps PatchSet entry
380 my @cvsps = `env TZ=UTC cvsps -q --cvs-direct -z 30 -g -s $rev`;
381 my $blank_lines_seen = 0;
383 while (my $line = shift @cvsps) {
384 $blank_lines_seen++ if ($line =~ /^$/);
385 last if $blank_lines_seen == 2;
391 return join("", @cvsps);
395 sub rcs_getctime ($) {
398 my $cvs_log_infoline=qr/^date: (.+);\s+author/;
400 open CVSLOG, "cvs -Q log -r1.1 '$file' |"
401 || error "couldn't get cvs log output: $!\n";
405 if (/$cvs_log_infoline/) {
409 close CVSLOG || warn "cvs log $file exited $?";
411 if (! defined $date) {
412 warn "failed to parse cvs log for $file\n";
416 eval q{use Date::Parse};
418 $date=str2time($date, 'UTC');
419 debug("found ctime ".localtime($date)." for $file");