Changeset 800 for dasscm

Timestamp:

Nov 10, 2009, 6:00:44 PM (14 years ago)

Author:

joergs

Message:

added revert

File:

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

dasscm/trunk/dasscm

@@ -91 +91 @@
     print "   add <path>\n";
     print "   commit <path>\n";
+    print "   revert <path>\n";
     print "   diff <path>\n";
     print "   status <path>\n";
@@ -97 +98 @@
     print "   permissions\n";
     print "\n";
-    print "preparation:\n", "  if dasscm is already configured,\n",
-      "  use 'dasscm login' and then eg. 'add'.\n",
-      "  The environment variables\n", "    DASSCM_REPO\n", "    DASSCM_PROD\n",
-      "    DASSCM_USERNAME\n", "    DASSCM_PASSWORD\n",
-      "  are evaluated, but set automatically by 'dasscm login'.\n", "\n",
-      "  If dasscm is not yet configured, read", "  $doc_file\n";
+    print "If dasscm is not yet configured, read $doc_file\n";
 }
 
@@ -321 +317 @@
     }
 
-    if ( not -r $filename_prod ) {
-        fatalerror( $filename_prod . " is not accessable" );
+    # file must be readable. Only exception is, when file should be reverted
+    if ( $command ne "revert" ) {
+        if ( not -r $filename_prod ) {
+            fatalerror( $filename_prod . " is not accessable" );
+        }
     }
 
@@ -333 +332 @@
     ( my $basename, my $dirname_prod ) = fileparse($filename_prod);
 
-    # uses chdir to determine real directory in a unique way
-    chdir $dirname_prod or die $!;
-    $dirname_prod = normalize_path( cwd() );
-    chdir $StartDirectory;
+    # normalize path. 
+    # not done for reverting, because in this case, the directory may not exist
+    # and the correct path should already be stored in the repository
+    if ( $command ne "revert" ) {
+        # uses chdir to determine real directory in a unique way
+        chdir $dirname_prod or fatalerror( "failed to access directory $dirname_prod: " . $! );
+        $dirname_prod = normalize_path( cwd() );
+        chdir $StartDirectory;
+    }
 
     my $dirname_repo  = normalize_path( $DASSCM_REPO . "/" . $dirname_prod );
@@ -372 +376 @@
       or error "failed to copy $filename_prod to repository: $!";
 }
+
 
 #
@@ -639 +644 @@
                 # remove it
                 print "removing $_\n";
-                unlink($_);
+                # unlink doesn't work recursive, there "rm -rf" is used
+                #unlink($_);
+                system( "rm -rf $_" );
             }
         }
@@ -1032 +1039 @@
 }
 
-sub blame(@)
+
+
+#
+# revert: copies files back from repository to system
+#
+sub revert(@)
 {
     check_parameter( @_, 1 );
@@ -1046 +1058 @@
       = get_filenames( $_[0] );
 
-    my $retcode = run_interactive("$SVN blame $svnOptions $filename_repo");
-}
-
-sub diff(@)
+    # return code for the shell
+    # default: error
+    my $return_code = $RETURN_OK;
+
+
+    # cleanup repository
+    ##cleanup();
+    #svn_update();
+
+    ( my $refChangedFiles, my $refRemovedFiles, my $refUnknownFiles ) =
+      getModifiedFiles($filename_prod);
+    my %changedfiles = %{$refChangedFiles};
+    my %removedfiles = %{$refRemovedFiles};
+    my %unknownfiles = %{$refUnknownFiles};
+
+    if ( %removedfiles or %changedfiles or %unknownfiles ) {
+
+        if (%removedfiles) {
+            print "DELETED files and directories. Recreated from repository:\n";
+            my @removedPaths = ( sort { length $a > length $b } keys %removedfiles );
+            print join( "\n", @removedPaths ) . "\n\n";
+
+            # copy files one by one from local repository to system
+            # and also create directories
+            # paths are sorted, so that directories are created first
+            for my $real_path ( @removedPaths ) {
+                if( -d $removedfiles{"$real_path"} ) {
+                    mkpath("$real_path");
+                } else {
+                    copy( $removedfiles{"$real_path"}, $real_path ) or error( "failed to copy " .  $removedfiles{"$real_path"} . " to " . $real_path . ": " . $! );
+                }
+            }
+        }
+
+        if (%changedfiles) {
+            print "MODIFIED files. Copied from repository to the system:\n";
+            print join( "\n", ( keys %changedfiles ) ) . "\n\n";
+
+            # copy files one by one from local repository to system
+            for my $real_file ( keys(%changedfiles) ) {
+                copy( $changedfiles{"$real_file"}, $real_file );
+            }
+
+        }
+
+        if (%unknownfiles) {
+            print "UNKNOWN: insufficient permission to check files:\n";
+            print join( "\n", ( keys %unknownfiles ) ) . "\n\n";
+
+            $return_code = $RETURN_NOK;
+        }
+
+    } else {
+        print "no modified files found in $dirname_repo\n";
+    }
+
+    return $return_code;
+}
+
+
+
+sub blame(@)
 {
     check_parameter( @_, 1 );
@@ -1063 +1133 @@
       = get_filenames( $_[0] );
 
+    my $retcode = run_interactive("$SVN blame $svnOptions $filename_repo");
+}
+
+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";
 
@@ -1110 +1197 @@
         if (%removedfiles) {
             print "DELETED: files found in repository, but not in system:\n";
-            print join( "\n", ( keys %removedfiles ) ) . "\n\n";
+            print join( "\n", sort ( keys %removedfiles ) ) . "\n\n";
         }
 
@@ -1325 +1412 @@
         $command = "commit";
         commit(@ARGV);
+    } elsif (m/^revert$/i) {
+        $command = "revert";
+        $return_code = revert(@ARGV);
     } elsif (m/^blame$/i) {
         $command = "blame";
@@ -1349 +1439 @@
         $return_code = $RETURN_NOK;
     }
-
-    # revert
-
 }