X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ac8eab29e8394aca4c0b23a6687ec947ea1ac869..8be7c6137fd98ba39e4517420ef3950960717d34:/IkiWiki/Plugin/cvs.pm diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm index 5ce3c5cbe..0a6cbfaf6 100644 --- a/IkiWiki/Plugin/cvs.pm +++ b/IkiWiki/Plugin/cvs.pm @@ -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';