make REPO_BASE absolute early
$ENV{GL_REPO_BASE_ABS} is meant to point to the same directory as $REPO_BASE, except it is meant to be passed to hooks, ADCs and other child programs. And since you can't be sure where the child program starts in, this became an absolute path. Gradually, however, I started using it wherever I needed an absolute path (mostly in code that jumps around various directories to do stuff). Which is silly, because there's no reason $REPO_BASE cannot also be made an absolute, even if the rc file has a relative path. So that's what I did now: made $REPO_BASE absolute very early on, and then systematically changed all uses of the longer form to the shorter form when appropriate. And so the only thing we now use the longer one for is to pass to child programs. (Implementation note: The actual change is not very big, but while I was about it I decided to make the test suite able to test with an absolute REPO_BASE also, which is why the commit seems so large.) ---- This all started with a complaint from Damien Regad. He had an extremely odd setup where his bashrc changed PWD to something other than $HOME before anything else ran. This caused those two variables to beceom inconsistent, and he had a 1-line fix he wanted me to apply. I generally don't like making special fixes for for non-standard setups, and anyway all he had to do was set the full path to REPO_BASE in the rc file to get around this. Which is what I told him and he very politely left it at that. However, this did get me thinking, and I soon realised I was needlessly conflating "relative versus absolute" with "able to be passed to child programs". Fixing that solved his problem also, as a side-effect. So I guess this is all thanks to Damien!
This commit is contained in:
parent
85fe9c1739
commit
6539009cb5
31 changed files with 158 additions and 151 deletions
|
@ -171,7 +171,7 @@ sub list_phy_repos
|
|||
{
|
||||
my @phy_repos;
|
||||
|
||||
wrap_chdir("$ENV{GL_REPO_BASE_ABS}");
|
||||
wrap_chdir($REPO_BASE);
|
||||
for my $repo (`find . -type d -name "*.git" -prune`) {
|
||||
chomp ($repo);
|
||||
$repo =~ s(\./(.*)\.git$)($1);
|
||||
|
@ -250,7 +250,7 @@ sub new_repo
|
|||
sub new_wild_repo {
|
||||
my ($repo, $user) = @_;
|
||||
|
||||
wrap_chdir("$ENV{GL_REPO_BASE_ABS}");
|
||||
wrap_chdir($REPO_BASE);
|
||||
new_repo($repo, "$GL_ADMINDIR/hooks/common", $user);
|
||||
# note pwd is now the bare "repo.git"; new_repo does that...
|
||||
wrap_print("gl-perms", "$GL_WILDREPOS_DEFPERMS\n") if $GL_WILDREPOS_DEFPERMS;
|
||||
|
@ -294,8 +294,8 @@ sub new_wild_repo {
|
|||
|
||||
# creator
|
||||
my $c = '';
|
||||
if ( -f "$ENV{GL_REPO_BASE_ABS}/$repo.git/gl-creater") {
|
||||
my $fh = wrap_open("<", "$ENV{GL_REPO_BASE_ABS}/$repo.git/gl-creater");
|
||||
if ( -f "$REPO_BASE/$repo.git/gl-creater") {
|
||||
my $fh = wrap_open("<", "$REPO_BASE/$repo.git/gl-creater");
|
||||
chomp($c = <$fh>);
|
||||
}
|
||||
|
||||
|
@ -308,8 +308,8 @@ sub new_wild_repo {
|
|||
# "WRITERS=>foo" and "TESTERS=>@all"
|
||||
my %perm_cats;
|
||||
|
||||
if ($user and -f "$ENV{GL_REPO_BASE_ABS}/$repo.git/gl-perms") {
|
||||
my $fh = wrap_open("<", "$ENV{GL_REPO_BASE_ABS}/$repo.git/gl-perms");
|
||||
if ($user and -f "$REPO_BASE/$repo.git/gl-perms") {
|
||||
my $fh = wrap_open("<", "$REPO_BASE/$repo.git/gl-perms");
|
||||
my $perms = join ("", <$fh>);
|
||||
# discard comments
|
||||
$perms =~ s/#.*//g;
|
||||
|
@ -353,7 +353,7 @@ sub get_set_perms
|
|||
$GL_WILDREPOS_PERM_CATS ||= "READERS WRITERS";
|
||||
my ($creator, $dummy, $dummy2) = wild_repo_rights($repo, "");
|
||||
die "$repo doesnt exist or is not yours\n" unless $user eq $creator;
|
||||
wrap_chdir("$ENV{GL_REPO_BASE_ABS}");
|
||||
wrap_chdir($REPO_BASE);
|
||||
wrap_chdir("$repo.git");
|
||||
if ($verb eq 'getperms') {
|
||||
return unless -f "gl-perms";
|
||||
|
@ -390,7 +390,7 @@ sub get_set_desc
|
|||
my($repo, $verb, $user) = @_;
|
||||
my ($creator, $dummy, $dummy2) = wild_repo_rights($repo, "");
|
||||
die "$repo doesnt exist or is not yours\n" unless $user eq $creator;
|
||||
wrap_chdir("$ENV{GL_REPO_BASE_ABS}");
|
||||
wrap_chdir($REPO_BASE);
|
||||
wrap_chdir("$repo.git");
|
||||
if ($verb eq 'getdesc') {
|
||||
print slurp("description") if -f "description";
|
||||
|
@ -562,7 +562,7 @@ sub expand_wild
|
|||
# display matching repos (from *all* the repos in the system) that $user
|
||||
# has at least "R" access to
|
||||
|
||||
chdir("$ENV{GL_REPO_BASE_ABS}") or die "chdir $ENV{GL_REPO_BASE_ABS} failed: $!\n";
|
||||
chdir($REPO_BASE) or die "chdir $REPO_BASE failed: $!\n";
|
||||
my $count = 0;
|
||||
for my $actual_repo (`find . -type d -name "*.git" -prune|sort`) {
|
||||
chomp ($actual_repo);
|
||||
|
@ -665,7 +665,7 @@ sub add_repo_conf
|
|||
{
|
||||
my ($repo) = shift;
|
||||
return unless $split_conf{$repo};
|
||||
do "$ENV{GL_REPO_BASE_ABS}/$repo.git/gl-conf" or return;
|
||||
do "$REPO_BASE/$repo.git/gl-conf" or return;
|
||||
$repos{$repo} = $one_repo{$repo};
|
||||
$git_configs{$repo} = $one_git_config{$repo};
|
||||
}
|
||||
|
@ -694,6 +694,8 @@ sub add_repo_conf
|
|||
# means we've been called from outside; see doc/admin-defined-commands.mkd
|
||||
where_is_rc();
|
||||
die "parse $ENV{GL_RC} failed: " . ($! or $@) unless do $ENV{GL_RC};
|
||||
# fix up REPO_BASE
|
||||
$REPO_BASE = "$ENV{HOME}/$REPO_BASE" unless $REPO_BASE =~ m(^/);
|
||||
}
|
||||
|
||||
my $perm = ' ';
|
||||
|
@ -701,7 +703,7 @@ sub add_repo_conf
|
|||
|
||||
# get basic info about the repo and fill %repos
|
||||
my $wild = '';
|
||||
my $exists = -d "$ENV{GL_REPO_BASE_ABS}/$repo.git";
|
||||
my $exists = -d "$REPO_BASE/$repo.git";
|
||||
if ($exists) {
|
||||
# the list of permission categories within gl-perms that this user is a member
|
||||
# of, or that specify @all as a member. See comments in
|
||||
|
@ -768,7 +770,7 @@ sub can_read {
|
|||
# helper to manage "disabling" a repo or the whole site for "W" access
|
||||
sub check_repo_write_enabled {
|
||||
my ($repo) = shift;
|
||||
for my $d ("$ENV{HOME}/.gitolite.down", "$ENV{GL_REPO_BASE_ABS}/$repo.git/.gitolite.down") {
|
||||
for my $d ("$ENV{HOME}/.gitolite.down", "$REPO_BASE/$repo.git/.gitolite.down") {
|
||||
next unless -f $d;
|
||||
die $ABRT . slurp($d) if -s $d;
|
||||
die $ABRT . "writes are currently disabled\n";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue