undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mk/gitweb-feature'

Browse Source 
* mk/gitweb-feature:
  gitweb: unify boolean feature subroutines
This commit is contained in:
Junio C Hamano 2009-01-07 00:09:33 -08:00
commit 4c6e8aa8f0
1 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gitweb/gitweb.perl
View File

@ -203,7 +203,7 @@ our %feature = (
# $feature{'blame'}{'override'} = 1; # $feature{'blame'}{'override'} = 1;
# and in project config gitweb.blame = 0|1; # and in project config gitweb.blame = 0|1;
'blame' => { 'blame' => {
'sub' => \&feature_blame, 'sub' => sub { feature_bool('blame', @_) },
'override' => 0, 'override' => 0,
'default' => [0]}, 'default' => [0]},
@ -241,7 +241,7 @@ our %feature = (
# $feature{'grep'}{'override'} = 1; # $feature{'grep'}{'override'} = 1;
# and in project config gitweb.grep = 0|1; # and in project config gitweb.grep = 0|1;
'grep' => { 'grep' => {
'sub' => \&feature_grep, 'sub' => sub { feature_bool('grep', @_) },
'override' => 0, 'override' => 0,
'default' => [1]}, 'default' => [1]},
@ -255,7 +255,7 @@ our %feature = (
# $feature{'pickaxe'}{'override'} = 1; # $feature{'pickaxe'}{'override'} = 1;
# and in project config gitweb.pickaxe = 0|1; # and in project config gitweb.pickaxe = 0|1;
'pickaxe' => { 'pickaxe' => {
'sub' => \&feature_pickaxe, 'sub' => sub { feature_bool('pickaxe', @_) },
'override' => 0, 'override' => 0,
'default' => [1]}, 'default' => [1]},
@ -363,16 +363,17 @@ sub gitweb_check_feature {
} }
sub feature_blame { sub feature_bool {
my ($val) = git_get_project_config('blame', '--bool'); my $key = shift;
my ($val) = git_get_project_config($key, '--bool');
if ($val eq 'true') { if ($val eq 'true') {
return 1; return (1);
} elsif ($val eq 'false') { } elsif ($val eq 'false') {
return 0; return (0);
} }
return $_[0]; return ($_[0]);
} }
sub feature_snapshot { sub feature_snapshot {
@ -387,30 +388,6 @@ sub feature_snapshot {
return @fmts; return @fmts;
} }
sub feature_grep {
my ($val) = git_get_project_config('grep', '--bool');
if ($val eq 'true') {
return (1);
} elsif ($val eq 'false') {
return (0);
}
return ($_[0]);
}
sub feature_pickaxe {
my ($val) = git_get_project_config('pickaxe', '--bool');
if ($val eq 'true') {
return (1);
} elsif ($val eq 'false') {
return (0);
}
return ($_[0]);
}
# checking HEAD file with -e is fragile if the repository was # checking HEAD file with -e is fragile if the repository was
# initialized long time ago (i.e. symlink HEAD) and was pack-ref'ed # initialized long time ago (i.e. symlink HEAD) and was pack-ref'ed
# and then pruned. # and then pruned.