From 198dcfd4c8100b4993c75cd2d8b6c57e86cf0aaa Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Sun, 22 Apr 2012 21:25:54 +0530 Subject: [PATCH] POST_CREATE efficiency... (please read below if you care) The POST_CREATE trigger is called when * a user creates a new "wild" repo, * a user uses the "perms" command, and * a user uses the "fork" command. The trigger calls 3 programs (see rc file): post-compile/update-git-configs post-compile/update-gitweb-access-list post-compile/update-git-daemon-access-list (They are also called by the POST_COMPILE trigger, by the way.) However, the 3 programs shown are a bit wasteful -- they run through *all* the repos when really only *one* repo has been affected. This patch * passes the repo name to the 3 programs (duh!) * adds the optimisation to the first of the 3 programs listed above (the one dealing with 'git config'). For the other two programs (gitweb and git-daemon), you have 3 choices: * if you don't have too many repos, ignore the problem. * take out the 2nd and 3rd lines from the POST_CREATE list in the rc file, so they don't run. Then run 'gitolite trigger POST_COMPILE' from cron at regular intervals. (Note that is POST_COMPILE not POST_CREATE!) However, this means that gitweb and daemon permissions won't be current immediately after someone adds a new repo or sets perms etc.; they get updated only on the next cron run. * patch the programs to add this optimisation (and send me the patches). The optimisation would check if arg-1 ($1 in shell, $ARGV[0] in perl) is 'POST_CREATE', and if it is, take the *next* argument as a repo name that may have changed. --- src/commands/fork | 2 +- src/commands/perms | 4 ++-- src/triggers/post-compile/update-git-configs | 21 ++++++++++++++++++-- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/commands/fork b/src/commands/fork index fb49d92..fe27035 100755 --- a/src/commands/fork +++ b/src/commands/fork @@ -59,4 +59,4 @@ ln -sf `gitolite query-rc GL_ADMIN_BASE`/hooks/common/* hooks echo "$from" > gl-forked-from # trigger post_create -gitolite trigger POST_CREATE +gitolite trigger POST_CREATE $to $GL_USER diff --git a/src/commands/perms b/src/commands/perms index dce271c..7be3a28 100755 --- a/src/commands/perms +++ b/src/commands/perms @@ -34,8 +34,9 @@ if ( $ARGV[0] eq '-l' ) { getperms(@ARGV); # doesn't return } +my $repo = shift; setperms(@ARGV); -_system( "gitolite", "trigger", "POST_CREATE" ); +_system( "gitolite", "trigger", "POST_CREATE", $repo, $ENV{GL_USER} ); # ---------------------------------------------------------------------- @@ -50,7 +51,6 @@ sub getperms { } sub setperms { - my $repo = shift; _die "sorry you are not authorised" if repo_missing($repo) or creator($repo) ne $ENV{GL_USER}; my $pf = "$rc{GL_REPO_BASE}/$repo.git/gl-perms"; diff --git a/src/triggers/post-compile/update-git-configs b/src/triggers/post-compile/update-git-configs index 446b28a..7f3fb83 100755 --- a/src/triggers/post-compile/update-git-configs +++ b/src/triggers/post-compile/update-git-configs @@ -13,13 +13,30 @@ use Gitolite::Conf::Load; use strict; use warnings; -# ---------------------------------------------------------------------- - my $RB = $rc{GL_REPO_BASE}; _chdir($RB); + +# ---------------------------------------------------------------------- +# if called from POST_CREATE, we have only a single repo to worry about +if (@ARGV and $ARGV[0] eq 'POST_CREATE') { + my $repo = $ARGV[1]; + fixup_config($repo); + + exit 0; +} + +# ---------------------------------------------------------------------- +# else it's all repos (i.e., called from POST_COMPILE) + my $lpr = list_phy_repos(); for my $pr (@$lpr) { + fixup_config($pr); +} + +sub fixup_config { + my $pr = shift; + my $gc = git_config( $pr, '.' ); while ( my ( $key, $value ) = each( %{$gc} ) ) { next if $key =~ /^gitolite-options\./;