Changeset 187 for trunk

Timestamp:

Nov 9, 2004, 10:17:50 PM (20 years ago)

Author:

joergs

Message:

added diff, commit

File:

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

trunk/dasscm/dasscm

@@ -17 +17 @@
 
 # util functions
+sub usage()
+{
+        print "dasscm is intended to help versioning configuration files\n";
+}
+
 sub check_env()
 {
@@ -43 +48 @@
 }
 
-sub run_command
-{
-  my $command = shift;
-
-  print "executing command: " . $command . "\n";
-
-  open(RESULT, $command . ' 2>&1 |' );
-  my @result = <RESULT>;
-  close(RESULT);
-  my $retcode = $?>>8;
-
-  print @result;
-  if( $retcode ) { print "return code: " . $retcode . "\n"; }
-
-  return($retcode, @result);
-}
-
-
-
-# functions
-
-sub help(;@)
-{
-        print "help for @_\n";
-}
-
-sub add(@)
-{
-        check_parameter(@_,1);
-        check_env();
+sub get_filenames(@)
+{
         my $filename_prod = $_[0];
         if ( !($filename_prod =~ m/^\//) ) {
@@ -93 +70 @@
         my $filename_repo = "$dirname_repo/$basename";
         
+        return ($basename,$dirname_prod,$dirname_repo,$filename_prod,$filename_repo);
+}
+
+sub run_command
+{
+  my $command = shift;
+
+  #print "executing command: " . $command . "\n";
+
+  open(RESULT, $command . ' 2>&1 |' );
+  my @result = <RESULT>;
+  close(RESULT);
+  my $retcode = $?>>8;
+
+  #print @result;
+  #if( $retcode ) { print "return code: " . $retcode . "\n"; }
+
+  return($retcode, @result);
+}
+
+
+
+# functions
+
+sub help(;@)
+{
+        print "help for @_\n";
+}
+
+sub add(@)
+{
+        check_parameter(@_,1);
+        check_env();
+        
+        (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]);
+                
         mkpath($dirname_repo);
         
         # update complete repository
-        run_command( "$SVN update $DASSCM_REPO" );
+        (my $retcode, my @result)=run_command( "$SVN update $DASSCM_REPO" );
+        if( $retcode != 0 ) {
+                print @result;
+                die;
+        }
 
         copy( $filename_prod, $filename_repo ) or die $!;
@@ -119 +136 @@
 }
 
+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;
+        }
+
+        # commit calls $EDITOR. uses "system" here, to display output
+        system( "$SVN commit $DASSCM_REPO" );
+        # TODO: commit (-m)
+}
+
+sub diff(@)
+{
+        check_parameter(@_,1);
+        check_env();
+        
+        (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]);
+                
+        #print "$basename,$dirname_prod,$dirname_repo\n";
+
+        (my $rc_update, my @result)=run_command( "$SVN update $filename_repo" );
+        if( $rc_update != 0 ) {
+                print @result;
+                die;
+        }
+        
+        (my $rc_diff, my @diff)=run_command( "diff $filename_repo $filename_prod" );
+        print @diff;    
+}
 
 # main
 
 my $number_arguments = @ARGV;
-print "$number_arguments\n";
+#print "$number_arguments\n";
 
 if ($number_arguments > 0) {
@@ -142 +195 @@
         } elsif (m/activate/i) {
                 activate(@ARGV);
-        }
-}
+        } else {
+                usage();
+                check_env();
+        }
+}