1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
|
#!/usr/pkg/bin/perl
package IkiWiki::Plugin::cvs;
use warnings;
use strict;
use IkiWiki;
sub import {
hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
hook(type => "getsetup", id => "cvs", call => \&getsetup);
hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
hook(type => "rcs", id => "rcs_prepedit", call => \&rcs_prepedit);
hook(type => "rcs", id => "rcs_commit", call => \&rcs_commit);
hook(type => "rcs", id => "rcs_commit_staged", call => \&rcs_commit_staged);
hook(type => "rcs", id => "rcs_add", call => \&rcs_add);
hook(type => "rcs", id => "rcs_remove", call => \&rcs_remove);
hook(type => "rcs", id => "rcs_rename", call => \&rcs_rename);
hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
}
sub checkconfig () {
if (! defined $config{cvspath}) {
$config{cvspath}="ikiwiki";
}
if (exists $config{cvspath}) {
# code depends on the path not having extraneous slashes
$config{cvspath}=~tr#/#/#s;
$config{cvspath}=~s/\/$//;
$config{cvspath}=~s/^\///;
}
if (defined $config{cvs_wrapper} && length $config{cvs_wrapper}) {
push @{$config{wrappers}}, {
wrapper => $config{cvs_wrapper},
wrappermode => (defined $config{cvs_wrappermode} ? $config{cvs_wrappermode} : "04755"),
};
}
}
sub getsetup () {
return
plugin => {
safe => 0, # rcs plugin
rebuild => undef,
},
cvsrepo => {
type => "string",
example => "/cvs/wikirepo",
description => "cvs repository location",
safe => 0, # path
rebuild => 0,
},
cvspath => {
type => "string",
example => "ikiwiki",
description => "path inside repository where the wiki is located",
safe => 0, # paranoia
rebuild => 0,
},
cvs_wrapper => {
type => "string",
example => "/cvs/wikirepo/CVSROOT/post-commit",
description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry",
safe => 0, # file
rebuild => 0,
},
cvs_wrappermode => {
type => "string",
example => '04755',
description => "mode for cvs_wrapper (can safely be made suid)",
safe => 0,
rebuild => 0,
},
historyurl => {
type => "string",
example => "http://cvs.example.org/cvsweb.cgi/ikiwiki/[[file]]",
description => "cvsweb url to show file history ([[file]] substituted)",
safe => 1,
rebuild => 1,
},
diffurl => {
type => "string",
example => "http://cvs.example.org/cvsweb.cgi/ikiwiki/[[file]].diff?r1=text&tr1=[[r1]]&r2=text&tr2=[[r2]]",
description => "cvsweb url to show a diff ([[file]], [[r1]], and [[r2]] substituted)",
safe => 1,
rebuild => 1,
},
}
sub cvs_info ($$) {
my $field=shift;
my $file=shift;
chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
my $info=`cvs status $file`;
my ($ret)=$info=~/^\s*$field:\s*(\S+)/m;
return $ret;
}
sub cvs_runcvs(@) {
my @cmd = @_;
unshift @cmd, 'cvs', '-Q';
chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
open(my $savedout, ">&STDOUT");
open(STDOUT, ">", "/dev/null");
my $ret = system(@cmd);
open(STDOUT, ">&", $savedout);
return ($ret == 0) ? 1 : 0;
}
sub cvs_is_controlling {
my $dir=shift;
$dir=$config{srcdir} unless defined($dir);
return (-d "$dir/CVS") ? 1 : 0;
}
sub rcs_update () {
return unless cvs_is_controlling;
cvs_runcvs('update', '-dP');
}
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;
return unless cvs_is_controlling;
# For cvs, return the revision of the file when
# editing begins.
my $rev=cvs_info("Repository revision", "$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.
my $file=shift;
my $message=shift;
my $rcstoken=shift;
my $user=shift;
my $ipaddr=shift;
return unless cvs_is_controlling;
if (defined $user) {
$message="web commit by $user".(length $message ? ": $message" : "");
}
elsif (defined $ipaddr) {
$message="web commit from $ipaddr".(length $message ? ": $message" : "");
}
# 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=cvs_info("Repository revision", "$config{srcdir}/$file");
if (defined $rev && defined $oldrev && $rev != $oldrev) {
# Merge their changes into the file that we've
# changed.
cvs_runcvs('update', $file) ||
warn("cvs merge from $oldrev to $rev failed\n");
}
if (! cvs_runcvs('commit', '-m',
IkiWiki::possibly_foolish_untaint $message)) {
my $conflict=readfile("$config{srcdir}/$file");
cvs_runcvs('update', '-C', $file) ||
warn("cvs revert failed\n");
return $conflict;
}
return undef # success
}
sub rcs_commit_staged ($$$) {
# Commits all staged changes. Changes can be staged using rcs_add,
# rcs_remove, and rcs_rename.
my ($message, $user, $ipaddr)=@_;
if (defined $user) {
$message="web commit by $user".(length $message ? ": $message" : "");
}
elsif (defined $ipaddr) {
$message="web commit from $ipaddr".(length $message ? ": $message" : "");
}
if (! cvs_runcvs('commit', '-m',
IkiWiki::possibly_foolish_untaint $message)) {
warn "cvs staged commit failed\n";
return 1; # failure
}
return undef # success
}
sub rcs_add ($) {
# filename is relative to the root of the srcdir
my $file=shift;
my $parent=IkiWiki::dirname($file);
my @files_to_add = ($file);
eval q{use File::MimeInfo};
error($@) if $@;
until ((length($parent) == 0) || cvs_is_controlling("$config{srcdir}/$parent")){
push @files_to_add, $parent;
$parent = IkiWiki::dirname($parent);
}
while ($file = pop @files_to_add) {
if (@files_to_add == 0) {
# file
my $filemime = File::MimeInfo::default($file);
if (defined($filemime) && $filemime eq 'text/plain') {
cvs_runcvs('add', $file) ||
warn("cvs add $file failed\n");
} else {
cvs_runcvs('add', '-kb', $file) ||
warn("cvs add binary $file failed\n");
}
} else {
# directory
cvs_runcvs('add', $file) ||
warn("cvs add $file failed\n");
}
}
}
sub rcs_remove ($) {
# filename is relative to the root of the srcdir
my $file=shift;
return unless cvs_is_controlling;
cvs_runcvs('rm', '-f', $file) ||
warn("cvs rm $file failed\n");
}
sub rcs_rename ($$) {
# filenames relative to the root of the srcdir
my ($src, $dest)=@_;
return unless cvs_is_controlling;
chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
if (system("mv", "$src", "$dest") != 0) {
warn("filesystem rename failed\n");
}
rcs_add($dest);
rcs_remove($src);
}
sub rcs_recentchanges($) {
my $num = shift;
my @ret;
return unless cvs_is_controlling;
eval q{use Date::Parse};
error($@) if $@;
chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
# There's no cvsps option to get the last N changesets.
# Write full output to a temp file and read backwards.
eval q{use File::Temp qw/tempfile/};
error($@) if $@;
eval q{use File::ReadBackwards};
error($@) if $@;
my (undef, $tmpfile) = tempfile(OPEN=>0);
system("env TZ=UTC cvsps -q --cvs-direct -z 30 -x >$tmpfile");
if ($? == -1) {
error "couldn't run cvsps: $!\n";
} elsif (($? >> 8) != 0) {
error "cvsps exited " . ($? >> 8) . ": $!\n";
}
tie(*SPSVC, 'File::ReadBackwards', $tmpfile)
|| error "couldn't open $tmpfile for read: $!\n";
while (my $line = <SPSVC>) {
$line =~ /^$/ || error "expected blank line, got $line";
my ($rev, $user, $committype, $when);
my (@message, @pages);
# We're reading backwards.
# Forwards, an entry looks like so:
# ---------------------
# PatchSet $rev
# Date: $when
# Author: $user (or user CGI runs as, for web commits)
# Branch: branch
# Tag: tag
# Log:
# @message_lines
# Members:
# @pages (and revisions)
#
while ($line = <SPSVC>) {
last if ($line =~ /^Members:/);
for ($line) {
s/^\s+//;
s/\s+$//;
}
my ($page, $revs) = split(/:/, $line);
my ($oldrev, $newrev) = split(/->/, $revs);
$oldrev =~ s/INITIAL/0/;
$newrev =~ s/\(DEAD\)//;
my $diffurl = defined $config{diffurl} ? $config{diffurl} : "";
$diffurl=~s/\[\[file\]\]/$page/g;
$diffurl=~s/\[\[r1\]\]/$oldrev/g;
$diffurl=~s/\[\[r2\]\]/$newrev/g;
unshift @pages, {
page => pagename($page),
diffurl => $diffurl,
} if length $page;
}
while ($line = <SPSVC>) {
last if ($line =~ /^Log:$/);
chomp $line;
unshift @message, { line => $line };
}
$committype = "web";
if (defined $message[0] &&
$message[0]->{line}=~/$config{web_commit_regexp}/) {
$user=defined $2 ? "$2" : "$3";
$message[0]->{line}=$4;
} else {
$committype="cvs";
}
$line = <SPSVC>; # Tag
$line = <SPSVC>; # Branch
$line = <SPSVC>;
if ($line =~ /^Author: (.*)$/) {
$user = $1 unless defined $user && length $user;
} else {
error "expected Author, got $line";
}
$line = <SPSVC>;
if ($line =~ /^Date: (.*)$/) {
$when = str2time($1, 'UTC');
} else {
error "expected Date, got $line";
}
$line = <SPSVC>;
if ($line =~ /^PatchSet (.*)$/) {
$rev = $1;
} else {
error "expected PatchSet, got $line";
}
$line = <SPSVC>; # ---------------------
push @ret, {
rev => $rev,
user => $user,
committype => $committype,
when => $when,
message => [@message],
pages => [@pages],
} if @pages;
last if @ret >= $num;
}
unlink($tmpfile) || error "couldn't unlink $tmpfile: $!\n";
return @ret;
}
sub rcs_diff ($) {
my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
# diff output is unavoidably preceded by the cvsps PatchSet entry
my @cvsps = `env TZ=UTC cvsps -q --cvs-direct -z 30 -g -s $rev`;
my $blank_lines_seen = 0;
while (my $line = shift @cvsps) {
$blank_lines_seen++ if ($line =~ /^$/);
last if $blank_lines_seen == 2;
}
if (wantarray) {
return @cvsps;
} else {
return join("", @cvsps);
}
}
sub rcs_getctime ($) {
my $file=shift;
my $cvs_log_infoline=qr/^date: (.+);\s+author/;
open CVSLOG, "cvs -Q log -r1.1 '$file' |"
|| error "couldn't get cvs log output: $!\n";
my $date;
while (<CVSLOG>) {
if (/$cvs_log_infoline/) {
$date=$1;
}
}
close CVSLOG || warn "cvs log $file exited $?";
if (! defined $date) {
warn "failed to parse cvs log for $file\n";
return 0;
}
eval q{use Date::Parse};
error($@) if $@;
$date=str2time($date, 'UTC');
debug("found ctime ".localtime($date)." for $file");
return $date;
}
1
|