Changeset 196

Timestamp:

Dec 6, 2004, 5:42:11 PM (20 years ago)

Author:

joergs

Message:

add -m Option. Unified add and commit. svn update without --username to prevent that the password had to be typed every time

File:

• trunk/dasscm/dasscm (modified) (10 diffs)

trunk/dasscm/dasscm

@@ -12 +12 @@
 use File::Copy;
 #use POSIX qw/getpgrp tcgetpgrp/;
+use Getopt::Long;
 
 #####################################################################
@@ -19 +20 @@
 my $SVN = "svn ";
 my $svnOptions = "";
+# command line options get stored in options hash
+my %options = (); 
+my $command;
 
 #####################################################################
@@ -75 +79 @@
                 $DASSCM_USER=$USER;
         }
-        $svnOptions .= " --username $DASSCM_USER "      
+        #$svnOptions .= " --username $DASSCM_USER "     
 }
 
@@ -107 +111 @@
 }
 
+
 sub run_command
 {
@@ -125 +130 @@
 
 
+
+sub run_interactive
+{
+        system( @_ );
+        if ($? == -1) {
+                printf "failed to execute: $!\n";
+        } elsif ($? & 127) {
+                printf "child died with signal %d, %s coredump\n",
+                        ($? & 127),  ($? & 128) ? 'with' : 'without';
+        } elsif( $? >> 8 != 0 ) {
+                        printf "child exited with value %d\n", $? >> 8;
+                }
+        }
+        return( $? >> 8 );
+}
+
+
 #####################################################################
 #
@@ -138 +160 @@
 }
 
+#
+# add (is used for command add and commit)
+#
 sub add(@)
 {
@@ -145 +170 @@
         (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]);
                 
-        mkpath($dirname_repo);
+        if( $command eq "add" ) {
+                mkpath($dirname_repo);
+        }
         
         # update complete repository
-#       (my $retcode, my @result)=run_command( "$SVN update $DASSCM_REPO" );
-#       if( $retcode != 0 ) {
-#               print @result;
-#               die;
-#       }
-        system( "$SVN update $svnOptions $DASSCM_REPO" );
+        my $retcode = run_interactive( "$SVN update $svnOptions $DASSCM_REPO" );
 
         copy( $filename_prod, $filename_repo ) or die $!;
         
-        # already checked in?
-        chdir($DASSCM_REPO);
-        # also add the path to filename.
-        for my $dir (split('/', $dirname_prod) ) {
-                if( $dir ) {
-                        run_command( "$SVN add --non-recursive $dir" );
-                        chdir $dir;
+        if( $command eq "add" ) {
+                # already checked in?
+                chdir($DASSCM_REPO);
+                # also add the path to filename.
+                for my $dir (split('/', $dirname_prod) ) {
+                        if( $dir ) {
+                                run_command( "$SVN add --non-recursive $dir" );
+                                chdir $dir;
+                        }
                 }
-        }
-        run_command( "$SVN add $basename" );
+                run_command( "$SVN add $basename" );
+        }
+        
+        if( $options{'message'} ) {
+                $svnOptions .= " --message $options{'message'} ";
+        }
 
         # commit calls $EDITOR. uses "system" here, to display output
-        system( "$SVN commit $svnOptions $DASSCM_REPO" );
-        # TODO: commit (-m)
+        my $retcode = run_interactive( "$SVN commit $svnOptions --username $DASSCM_USER $DASSCM_REPO" );
 
         print $filename_prod."\n";
@@ -184 +211 @@
         (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]);
 
-        system( "$SVN blame $svnOptions $filename_repo" );
-}
-
-
-
-sub commit(@)
-{
-        check_parameter(@_,1);
-        check_env();
-        
-        (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]);
-
-#       (my $rc_update, my @result)=run_command( "$SVN update $filename_repo" );
-#       if( $rc_update != 0 ) {
-#               print @result;
-#               die;
-#       }
-        system( "$SVN update $svnOptions $DASSCM_REPO" );
-        
-        copy( $filename_prod, $filename_repo ) or die $!;
-
-        # commit calls $EDITOR. uses "system" here, to display output
-        system( "$SVN commit $svnOptions $filename_repo" );
-        # TODO: commit (-m)
-}
+        my $retcode = run_interactive( "$SVN blame $svnOptions $filename_repo" );
+}
+
+
 
 sub diff(@)
@@ -238 +244 @@
 
 if ($number_arguments > 0) {
-        my $command = $ARGV[0];
+        # get subcommand and remove it from @ARGV
+        $command = $ARGV[0];
         shift @ARGV;
-        #$command =~ s/[A-Z]/[a-z]/m;
-        #print "$command\n";
+
+
+        # get command line options and store them in options hash
+        my $result = GetOptions ( \%options, 'message=s' );
+        foreach my $option (keys %options) {
+                print $option.": ".$options{$option}."\n";
+        }
 
         $_=$command;
@@ -247 +259 @@
                 help(@ARGV);
         } elsif (m/add/i) {
-                add(@ARGV);
+                # rewrite command. just to make sure
+                $command = "add";
+                add( @ARGV);
+        } elsif (m/commit/i) {
+                # rewrite command. just to make sure    
+                $command = "commit";    
+                add( @ARGV);
         } elsif (m/blame/i) {
                 blame(@ARGV);                   
-        } elsif (m/commit/i) {
-                commit(@ARGV);
         } elsif (m/diff/i) {
                 diff(@ARGV);