summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorSebastien Cevey <seb@cine7.net>2011-04-29 17:52:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-29 21:21:48 (GMT)
commite4e3b32bd2317ab73f03d692ab3f7231e2e6787d (patch)
tree45c7fad50db246a879d5f8943741e48e2c5375a4 /gitweb
parent0fa920c35c2617d7c1756b1e2bf5c56a81db3232 (diff)
downloadgit-e4e3b32bd2317ab73f03d692ab3f7231e2e6787d.zip
git-e4e3b32bd2317ab73f03d692ab3f7231e2e6787d.tar.gz
git-e4e3b32bd2317ab73f03d692ab3f7231e2e6787d.tar.bz2
gitweb: Modularized git_get_project_description to be more generic
Introduce a git_get_file_or_project_config utility function to retrieve a repository variable either from a plain text file in the $GIT_DIR or else from 'gitweb.$variable' in the repository config (e.g. 'description'). This would be used in next commit to retrieve category for a project, which is to be stored in the same way as project description. Signed-off-by: Sebastien Cevey <seb@cine7.net> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb')
-rwxr-xr-xgitweb/gitweb.perl24
1 files changed, 16 insertions, 8 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index f8d5722..e8685ac 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2562,18 +2562,26 @@ sub git_get_path_by_hash {
## ......................................................................
## git utility functions, directly accessing git repository
-sub git_get_project_description {
- my $path = shift;
+# get the value of config variable either from file named as the variable
+# itself in the repository ($GIT_DIR/$name file), or from gitweb.$name
+# configuration variable in the repository config file.
+sub git_get_file_or_project_config {
+ my ($path, $name) = @_;
$git_dir = "$projectroot/$path";
- open my $fd, '<', "$git_dir/description"
- or return git_get_project_config('description');
- my $descr = <$fd>;
+ open my $fd, '<', "$git_dir/$name"
+ or return git_get_project_config($name);
+ my $conf = <$fd>;
close $fd;
- if (defined $descr) {
- chomp $descr;
+ if (defined $conf) {
+ chomp $conf;
}
- return $descr;
+ return $conf;
+}
+
+sub git_get_project_description {
+ my $path = shift;
+ return git_get_file_or_project_config($path, 'description');
}
# supported formats: