X-Git-Url: https://git.donarmstrong.com/?p=bin.git;a=blobdiff_plain;f=sa;h=acf37dff3827ffc7d70ba98c366fa8920d2e39c0;hp=d652cccd3d6c39d473dd0b3fac3113f73c70fa93;hb=HEAD;hpb=fe5b331160d5d58f475ff9ca5501af27c5dd5b5b

diff --git a/sa b/sa
index d652ccc..acf37df 100755
--- a/sa
+++ b/sa
@@ -16,6 +16,7 @@ sa [options] [status|update|checkout] [directories to sync]
 
  Options:
   --quick, -Q don't update external projects
+  --verbose, -v be more verbose
   --quiet, -q be quiet
   --debug, -d debugging level (Default 0)
   --help, -h display this help
@@ -45,24 +46,79 @@ Display this manual.
 
 
 
-use User;
-use vars qw($DEBUG);
-
-# XXX parse config file
+#use User;
+use IO::File;
+use vars qw($DEBUG $VERBOSE);
 
 my %options = (quick           => 1,
-	       quiet           => 0,
+	       quiet           => 1,
 	       debug           => 0,
 	       help            => 0,
 	       man             => 0,
+	       verbose         => 0,
+	       hooks_only      => 0,
 	      );
 
-GetOptions(\%options,'debug|d+','help|h|?','man|m');
+GetOptions(\%options,'quick|Q+','quiet|q!','debug|d+','help|h|?','man|m','verbose|v+','hooks_only|hooks-only');
 
 pod2usage() if $options{help};
 pod2usage({verbose=>2}) if $options{man};
 
+# parse configuration file
+
+=head1 CONFIGURATION
+
+Reads configuration information from Start by parsing /etc/sa.conf,
+then the contents of ~/sa.d/ which match ^[\w\d][\w\d_.-]+$
+
+The configuration file contains a list of svn repositories which
+should be queried; each line can contain a tab, which indicates that
+the command following the tab should be run after the svn directory is
+updated.
+
+The configuration files are read in the order given above.
+
+=cut
+
+sub parse_config_file {
+     my ($repos,$filename,$home) = @_;
+     return unless -e $filename and -r _;
+     my $fh = new IO::File $filename, 'r' or die "Unable to read configuration file $filename $!";
+     while (<$fh>) {
+	  chomp;
+	  next if /^#/;
+	  my ($repo,$command) = split /\t/,$_,2;
+	  $repo =~ s/^\~/$home/;
+	  $$repos{$repo} = $command;
+     }
+}
+
+my $HOME=$ENV{HOME};
+my $HOSTNAME=qx(hostname);
+$HOSTNAME=~s/\n//g;
+my $CAN_IGNORE_EXTERNALS = 0;
+if (not $options{hooks_only}) {
+     qx(svn --version) =~ /\(r(\d+)\)/;
+     if ($1 > 13838) {
+	  $CAN_IGNORE_EXTERNALS = 1;
+     }
+}
+
+sub available_config_files{
+     my $dir;
+     opendir($dir, "$HOME/.sa.d/") or return ();
+     return map {"$HOME/.sa.d/$_"} grep /^[\w\d][\w\d_.-]+$/, readdir $dir;
+}
+
+my %repos;
+for ('/etc/sa.conf', available_config_files()) {
+     if (-e $_) {
+	  parse_config_file(\%repos,$_,$HOME);
+     }
+}
+
 $DEBUG = $options{debug};
+$VERBOSE = $options{verbose};
 
 my $command;
 
@@ -73,10 +129,19 @@ else {
      $command = 'status';
 }
 
-my $HOME=User->Home;
-
-for my $dir (map{"${HOME}/$_"} '',qw(.hide bin lib)) {
-     if (-e "$dir/.svn") {
-	  system('svn',$command,$dir);
+while (my ($repo,$run_after) = each(%repos)) {
+     print "Checking [$repo]\n";
+     if (-e "$repo/.svn" and not $options{hooks_only}) {
+	  system('svn',
+		 $command,
+		 (not $VERBOSE and $options{quiet})?'-q':(),
+		 ($VERBOSE >= 2)?'-v':(),
+		 ($options{quick} and $CAN_IGNORE_EXTERNALS)?'--ignore-externals':(),
+		 $options{quick}>1?'-N':(),
+		 $repo,
+		);
+     }
+     if ($command =~ /^up(?:date)?|checkout$/) {
+	  system('sh', '-c',"$run_after $repo") if defined $run_after and length $run_after;
      }
 }