deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make "expand" also print version, like "info" does

Browse source 
(thanks to Ilari for catching this)
This commit is contained in:
Sitaram Chamarty 2010-04-16 19:19:50 +05:30
parent 9670447d69
commit 34aad34478
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gitolite.pm
View file

@ -277,6 +277,12 @@ sub parse_acl
# print a report of $user's basic permissions # print a report of $user's basic permissions
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
sub report_version {
my($GL_ADMINDIR, $user) = @_;
print "hello $user, the gitolite version here is ";
system("cat", ($GL_PACKAGE_CONF || "$GL_ADMINDIR/conf") . "/VERSION");
}
# basic means wildcards will be shown as wildcards; this is pretty much what # basic means wildcards will be shown as wildcards; this is pretty much what
# got parsed by the compile script # got parsed by the compile script
sub report_basic sub report_basic
@ -286,9 +292,8 @@ sub report_basic
&parse_acl($GL_CONF_COMPILED, "", "CREATER", "READERS", "WRITERS"); &parse_acl($GL_CONF_COMPILED, "", "CREATER", "READERS", "WRITERS");
# send back some useful info if no command was given # send back some useful info if no command was given
print "hello $user, the gitolite version here is "; &report_version($GL_ADMINDIR, $user);
system("cat", ($GL_PACKAGE_CONF || "$GL_ADMINDIR/conf") . "/VERSION"); print "\rthe gitolite config gives you the following access:\r\n";
print "\ryou have the following permissions:\r\n";
for my $r (sort keys %repos) { for my $r (sort keys %repos) {
# @all repos; meaning of read/write flags: # @all repos; meaning of read/write flags:
# @ => @all users are allowed access to this repo # @ => @all users are allowed access to this repo
@ -307,8 +312,10 @@ sub report_basic
sub expand_wild sub expand_wild
{ {
my($GL_CONF_COMPILED, $repo_base_abs, $repo, $user) = @_; my($GL_ADMINDIR, $GL_CONF_COMPILED, $repo_base_abs, $repo, $user) = @_;
&report_version($GL_ADMINDIR, $user);
print "\ryou have access to the following repos on the server:\r\n";
# this is for convenience; he can copy-paste the output of the basic # this is for convenience; he can copy-paste the output of the basic
# access report instead of having to manually change CREATER to his name # access report instead of having to manually change CREATER to his name
$repo =~ s/\bCREAT[EO]R\b/$user/g; $repo =~ s/\bCREAT[EO]R\b/$user/g;

2
src/gl-auth-command
View file

@ -127,7 +127,7 @@ if ($ENV{SSH_ORIGINAL_COMMAND} =~ $CUSTOM_COMMANDS) {
elsif ($verb eq 'expand') { elsif ($verb eq 'expand') {
# with a wildcard, you can "expand" it to see what repos actually match # with a wildcard, you can "expand" it to see what repos actually match
die "$repo has invalid characters" unless "x$repo" =~ $REPOPATT_PATT; die "$repo has invalid characters" unless "x$repo" =~ $REPOPATT_PATT;
expand_wild($GL_CONF_COMPILED, $repo_base_abs, $repo, $user); expand_wild($GL_ADMINDIR, $GL_CONF_COMPILED, $repo_base_abs, $repo, $user);
} else { } else {
die "$cmd doesn't make sense to me\n"; die "$cmd doesn't make sense to me\n";
} }