(no commit message)

[git.ikiwiki.info.git] / IkiWiki / Plugin / cvs.pm

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 5ce3c5cbe98698049cab9d0dc76f0289d69de776..0a6cbfaf6358f7a53014260f71c69ae5820641dc 100644 (file)
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -202,24 +202,6 @@ sub rcs_commit_staged (@) {
        return undef # success
 }
 
        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;
 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;
 }
 
        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';
 sub cvs_runcvs(@) {
        my @cmd = @_;
        unshift @cmd, 'cvs', '-Q';