# # # patch "git-cvsserver.perl" # from [64c1ef82476537e30c8fa78e81338edc378de957] # to [02f45b17f5dbd6345de409acc85cb5007f1b37ad] # ============================================================ --- git-cvsserver.perl 64c1ef82476537e30c8fa78e81338edc378de957 +++ git-cvsserver.perl 02f45b17f5dbd6345de409acc85cb5007f1b37ad @@ -171,31 +171,31 @@ return 0; } - my @gitvars = `git-repo-config -l`; + my @gitvars = `monotone list vars`; if ($?) { - print "E problems executing git-repo-config on the server -- this is not a git repository or the PATH is not set correctly.\n"; + print "E problems executing 'monotone list vars' on the server -- this is not a monotone repository or the PATH is not set correctly.\n"; print "E \n"; - print "error 1 - problem executing git-repo-config\n"; + print "error 1 - problem executing 'monotone list vars'\n"; return 0; } foreach my $line ( @gitvars ) { - next unless ( $line =~ /^(.*?)\.(.*?)=(.*)$/ ); + next unless ( $line =~ /^(.*?):(.*?) (.*)$/ ); $cfg->{$1}{$2} = $3; } - unless ( defined ( $cfg->{gitcvs}{enabled} ) and $cfg->{gitcvs}{enabled} =~ /^\s*(1|true|yes)\s*$/i ) + unless ( defined ( $cfg->{monotonecvs}{enabled} ) and $cfg->{monotonecvs}{enabled} =~ /^\s*(1|true|yes)\s*$/i ) { - print "E GITCVS emulation needs to be enabled on this repo\n"; - print "E the repo config file needs a [gitcvs] section added, and the parameter 'enabled' set to 1\n"; + print "E MONOTONECVS emulation needs to be enabled on this repo\n"; + print "E the repo needs some database variables in the 'monotonecvs' comain added, and the variable 'enabled' set to 1\n"; print "E \n"; - print "error 1 GITCVS emulation disabled\n"; + print "error 1 MONOTONECVS emulation disabled\n"; return 0; } - if ( defined ( $cfg->{gitcvs}{logfile} ) ) + if ( defined ( $cfg->{monotonecvs}{logfile} ) ) { - $log->setfile($cfg->{gitcvs}{logfile}); + $log->setfile($cfg->{monotonecvs}{logfile}); } else { $log->nofile(); }