Changeset 268 for trunk

Timestamp:

Mar 3, 2009, 6:18:03 PM (16 years ago)

Author:

joergs

Message:

added command commitall

File:

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

trunk/dasscm/dasscm

@@ -36 +36 @@
 # commands that require write access (and therefore a login)
 # to the repository server
-my @COMMANDS_REQUIRE_WRITE = ( "add", "commit" );
+my @COMMANDS_REQUIRE_WRITE = ( "add", "commit", "commitall" );
 
 # configuration file
@@ -50 +50 @@
 my $StartDirectory = cwd();
 
+my $diff                   = "diff --exclude .svn ";
 my $SVN                    = "svn ";
 my $svnOptions             = "";
 my $svnCheckoutCredentials = "";
 my $svnPasswordCredentials = "";
-my $diff                   = "diff --exclude .svn ";
+# flag. Set to true by svn_update
+# This prevents, that svn_update is called multiple times
+my $svnRepositoryIsUptodate = 0;
 
 # command line options get stored in options hash
@@ -61 +64 @@
 # subcommand, that gets executed (add, commit, ...)
 my $command;
+
 
 my $verbose = 0;
@@ -82 +86 @@
     print "   add <filename>\n";
     print "   commit <filename>\n";
+    print "   commitall\n";
     print "   diff <filename>\n";
     print "   status\n";
@@ -455 +460 @@
 sub svn_update( ;$ )
 {
-    my $update_path = shift || $DASSCM_REPO;
-    ( my $rc_update, my @result ) =
-      run_command(
-        "$SVN update --non-interactive $svnCheckoutCredentials $update_path");
-    print @result;
-    if ( $rc_update != 0 ) {
-        fatalerror();
-    }
-}
+    if( ! $svnRepositoryIsUptodate ) {
+        my $update_path = shift || $DASSCM_REPO;
+        ( my $rc_update, my @result ) =
+        run_command(
+            "$SVN update --non-interactive $svnCheckoutCredentials $update_path");
+        print @result;
+        if ( $rc_update != 0 ) {
+            fatalerror();
+        } else {
+            $svnRepositoryIsUptodate = 1;
+        }
+    }
+}
+
+
 
 sub svn_getStoredFiles( ;$ )
@@ -486 +497 @@
     return @result;
 }
+
+
+sub getModifiedFiles( ;$ )
+{
+    # TODO: get_filenames?
+    #my $rel_path = shift || "";
+    #my $path = "${DASSCM_REPO}/${rel_path}";
+    my $path = ${DASSCM_REPO};
+    my @files = svn_getStoredFiles($path);
+
+    # stores result from status (cvscheck)
+    my %removedfiles = ();
+    my %changedfiles = ();
+
+    # create list of modified files
+    if (@files) {
+
+        foreach my $file (@files) {
+
+            my $realfile    = "/" . $file;
+            my $cvsworkfile = "${DASSCM_REPO}/${file}";
+
+            if ( -d $realfile ) {
+                ## directory. do nothing
+            } elsif ( !-r $realfile ) {
+                $removedfiles{"$realfile"} = $cvsworkfile;
+            } else {
+                ( -r "$cvsworkfile" )
+                  || die("Fehler: $cvsworkfile ist nicht lesbar");
+                if ( compare( $cvsworkfile, $realfile ) != 0 ) {
+                    $changedfiles{"$realfile"} = $cvsworkfile;
+                }
+            }
+        }
+    }
+
+    return ( \%changedfiles, \%removedfiles );
+}
+
 
 #
@@ -692 +742 @@
 }
 
+
+
 #
 # add (is used for command add and commit)
@@ -720 +772 @@
     }
 
+    # TODO: check in links and also link target? At least warn about link target
     if (@links) {
         my $number = $#links + 1;
@@ -753 +806 @@
         "$SVN commit $svnOptions --username '$DASSCM_USERNAME' $svnPasswordCredentials $DASSCM_REPO"
       );
-
-    #print $filename_prod. "\n";
-    #print $dirname_repo. "\n";
-}
+}
+
+
+
+#
+# checks in all modified files
+#
+sub commitall(@)
+{
+    check_parameter( @_, 1 );
+    check_env();
+
+    # TODO: get_filenames?
+    #my $rel_path = shift || "";
+    #my $path = "${DASSCM_REPO}/${rel_path}";
+    my $dir = ${DASSCM_REPO};
+
+    #
+    # update local repository
+    #
+    svn_update();
+
+    ( my $refChangedFiles, my $refRemovedFiles ) = getModifiedFiles( $dir );
+    my %changedfiles = %{$refChangedFiles};
+    my %removedfiles = %{$refRemovedFiles};
+
+    if( %removedfiles ) {
+        my $removedFilesString = '"' . join( '" "', values(%removedfiles) ) . '"';
+        my ( $rc, @out ) = run_command( "$SVN rm $removedFilesString" );
+        if ( $rc > 0 ) {
+            print join( "\n", @out );
+        }
+    }
+
+    # add will care about the rest, including permission file and commiting
+    add( keys %changedfiles );
+}
+
+
 
 sub blame(@)
@@ -819 +907 @@
     # TODO: start at subdirectories ?
     my $dir   = $DASSCM_REPO;
-    my @files = svn_getStoredFiles($dir);
-
-    # Liste der geänderten Files ausgeben, falls nicht leer
-    if (@files) {
-
-        # stores result from status (cvscheck)
-        my %removedfiles = ();
-        my %changedfiles = ();
-
-        foreach my $file (@files) {
-
-            my $realfile    = "/" . $file;
-            my $cvsworkfile = "${DASSCM_REPO}/${file}";
-
-            if ( -d $realfile ) {
-
-                # directory. do nothing
-            } elsif ( !-r $realfile ) {
-                $removedfiles{"$realfile"} = $cvsworkfile;
-            } else {
-                ( -r "$cvsworkfile" )
-                  || die("Fehler: $cvsworkfile ist nicht lesbar");
-                if ( compare( $cvsworkfile, $realfile ) != 0 ) {
-                    $changedfiles{"$realfile"} = $cvsworkfile;
-                }
-            }
-        }
-
+    ( my $refChangedFiles, my $refRemovedFiles ) = getModifiedFiles( $dir );
+    my %changedfiles = %{$refChangedFiles};
+    my %removedfiles = %{$refRemovedFiles};
+
+    if( %removedfiles or %changedfiles ) {
         if (%removedfiles) {
             print "deleted files (found in repository, but not in system):\n";
@@ -866 +931 @@
     }
 
-    print "\n";
-
     return $return_code;
 }
+
+
 
 sub permissions(@)
@@ -918 +983 @@
     }
 }
+
+
 
 #####################################################################
@@ -987 +1054 @@
         $command = "update";
         update(@ARGV);
+    } elsif ( (m/commitall/i) || (m/cia/i) ) {
+        $command = "commitall";
+        commitall(@ARGV);
     } elsif (m/add/i) {
         $command = "add";
         add(@ARGV);
-    } elsif ( (m/commit/i) || (m/ci/i) ) {
+    } elsif ( (m/commit/i) || (m/checkin/i) || (m/ci/i) ) {
         $command = "commit";
         add(@ARGV);
@@ -1013 +1083 @@
 
     # cleanup (svn-commit.tmp)
-    # commitall
     # revert
     # activate