urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move cvs_keyword_subst_args() down with the other internal support routines.

master
Amitai Schlair 2012-01-26 17:08:12 -05:00
parent ac8eab29e8
commit d6b7654fcf
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
IkiWiki/Plugin/cvs.pm
View File

@ -202,24 +202,6 @@ sub rcs_commit_staged (@) {
return undef # success
}
sub cvs_keyword_subst_args ($) {
my $file = shift;
local $CWD = $config{srcdir};
eval q{use File::MimeInfo};
error($@) if $@;
my $filemime = File::MimeInfo::default($file);
# if (-T $file) {
if (defined($filemime) && $filemime eq 'text/plain') {
return ($file);
}
else {
return ('-kb', $file);
}
}
sub rcs_add ($) {
# filename is relative to the root of the srcdir
my $file=shift;
@ -497,6 +479,24 @@ sub cvs_is_controlling {
return (-d "$dir/CVS") ? 1 : 0;
}
sub cvs_keyword_subst_args ($) {
my $file = shift;
local $CWD = $config{srcdir};
eval q{use File::MimeInfo};
error($@) if $@;
my $filemime = File::MimeInfo::default($file);
# if (-T $file) {
if (defined($filemime) && $filemime eq 'text/plain') {
return ($file);
}
else {
return ('-kb', $file);
}
}
sub cvs_runcvs(@) {
my @cmd = @_;
unshift @cmd, 'cvs', '-Q';