From 9650d2fb3febc2fbe50637edacd6f4c7f6f92faa Mon Sep 17 00:00:00 2001
From: Sitaram Chamarty <sitaram@atc.tcs.com>
Date: Sat, 17 Mar 2012 07:40:17 +0530
Subject: [PATCH] (minor)

trace rationalisation plus perltidy again
---
 src/Gitolite/Conf.pm      | 2 +-
 src/Gitolite/Conf/Load.pm | 5 ++++-
 src/commands/help         | 4 ++--
 src/gitolite              | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Gitolite/Conf.pm b/src/Gitolite/Conf.pm
index ac60764..b64f748 100644
--- a/src/Gitolite/Conf.pm
+++ b/src/Gitolite/Conf.pm
@@ -63,7 +63,7 @@ sub parse {
             my @validkeys = split( ' ', ( $rc{GIT_CONFIG_KEYS} || '' ) );
             push @validkeys, "gitolite-options\\..*";
             my @matched = grep { $key =~ /^$_$/ } @validkeys;
-            _die "git config $key not allowed\ncheck GIT_CONFIG_KEYS in the rc file" if (@matched < 1);
+            _die "git config $key not allowed\ncheck GIT_CONFIG_KEYS in the rc file" if ( @matched < 1 );
             _die "bad value '$value'" if $value =~ $UNSAFE_PATT;
             add_config( 1, $key, $value );
         } elsif ( $line =~ /^subconf (\S+)$/ ) {
diff --git a/src/Gitolite/Conf/Load.pm b/src/Gitolite/Conf/Load.pm
index 5ab3747..711b405 100644
--- a/src/Gitolite/Conf/Load.pm
+++ b/src/Gitolite/Conf/Load.pm
@@ -126,6 +126,7 @@ sub git_config {
     # and the final map does this:
     #                 'foo.bar'=>'repo'  ,      'foodbar'=>'repoD'
 
+    trace( 3, map { ( "$_" => "-> $ret{$_}" ) } ( sort keys %ret ) );
     return \%ret;
 }
 
@@ -165,7 +166,7 @@ sub load_1 {
     trace( 3, $repo );
 
     if ( repo_missing($repo) ) {
-        trace( 3, "repo '$repo' missing" );
+        trace( 2, "repo '$repo' missing" );
         return;
     }
     _chdir("$rc{GL_REPO_BASE}/$repo.git");
@@ -237,6 +238,7 @@ sub memberships {
     my $type  = shift;
     my $item  = shift;
     my $item2 = '';
+    trace( 3, $type, $item );
 
     my @ret = ( $item, '@all' );
 
@@ -263,6 +265,7 @@ sub memberships {
     }
 
     @ret = @{ sort_u( \@ret ) };
+    trace( 3, sort @ret );
     return @ret;
 }
 
diff --git a/src/commands/help b/src/commands/help
index acd9a77..211b73a 100755
--- a/src/commands/help
+++ b/src/commands/help
@@ -13,11 +13,11 @@ Prints a list of custom commands available at this gitolite installation.
 =cut
 
 my $user = $ENV{GL_USER} || '';
-print "hello" . ( $user ? " $user" : "") . ", this is gitolite3 " . version() . " on git " . substr( `git --version`, 12 ) . "\n";
+print "hello" . ( $user ? " $user" : "" ) . ", this is gitolite3 " . version() . " on git " . substr( `git --version`, 12 ) . "\n";
 
 _chdir("$ENV{GL_BINDIR}/commands");
 
-print "list of " . ($user ? "remote" : "gitolite" ) . " commands available:\n\n";
+print "list of " . ( $user ? "remote" : "gitolite" ) . " commands available:\n\n";
 
 for my $c (`find . -type f|sort`) {
     chomp($c);
diff --git a/src/gitolite b/src/gitolite
index a934d00..949f3ef 100755
--- a/src/gitolite
+++ b/src/gitolite
@@ -123,5 +123,7 @@ sub run_all {
                 _system( $sfp, @ARGV );    # they better all return with 0 exit codes!
             }
         }
+        return;
     }
+    trace( 2, "'$rc_section' not found in rc" );
 }