Changeset 209

Timestamp:

Jul 2, 2007, 6:01:28 PM (17 years ago)

Author:

joergs

Message:

migrated from dasscm_chkconf to dasscm status

Location:

trunk/dasscm

Files:

• dasscm (modified) (7 diffs)
• dasscm_chkconf (deleted)

trunk/dasscm/dasscm

@@ -8 +8 @@
   qw($DASSCM_PROD $DASSCM_REPO $USER $DASSCM_USERNAME $DASSCM_USER $DASSCM_PASSWORD);
 use Cwd;
+use POSIX qw/getpgrp tcgetpgrp/;
 use Term::ReadKey;
 use File::Basename;
+use File::Compare;
+use File::Copy;
+use File::Find;
 use File::stat;
 use File::Path;
-use File::Copy;
 use Getopt::Long;
 
@@ -46 +49 @@
 
 my $verbose = 0;
+
+# stores result from status (cvscheck)
+my %status_removedfiles = ();
+my %status_changedfiles = ();
 
 #####################################################################
@@ -179 +186 @@
 }
 
+#
+# used by status
+# checks for differences between PROD and (local) REPO
+#
+sub cvscheck
+{
+    return unless -f;    # keine Directories
+    return if $File::Find::dir =~ /\/CVS$/;    # ignoriere CVS-Verzeichnisse
+    return
+      if $File::Find::dir =~
+      /\/\.svn/; # ignoriere Subversion Verzeichnisse (inkl. Unterverzeichnisse)
+    my $cvsworkfile = "$File::Find::dir/$_";
+
+    # Ursprungspfad ermitteln
+    # TODO: get_filename ?
+    $cvsworkfile =~ /${DASSCM_REPO}\/(.+)/;
+    my $realfile = "/" . $1;
+
+    # relativer Pfad zur CVS-Arbeitsdatei
+    my $relcvsworkfile = $1;
+
+    if ( !-r $realfile ) {
+        $status_removedfiles{"$realfile"} = $cvsworkfile;
+    } else {
+        ( -r "$cvsworkfile" ) || die("Fehler: $cvsworkfile ist nicht lesbar");
+        if ( compare( $cvsworkfile, $realfile ) != 0 ) {
+
+            # Dateien unterscheiden sich
+            #(-w $cvsworkfile) || die("failed: no Fehler: kein Schreibrecht auf $cvsworkfile");
+            # Arbeitskopie durch Kopie ersetzen
+            #copy($realfile,$cvsworkfile) || die("Fehler beim kopieren $realfile --> $cvsworkfile");
+            $status_changedfiles{"$realfile"} = $cvsworkfile;
+        }
+    }
+}
+
 sub run_command
 {
@@ -290 +333 @@
     $ENV{'DASSCM_PASSWORD'} = $input_password;
 
-    # TODO: print environment
-
-    exec("bash") or die "can't login";
+    print "subversion access okay\n\n", "DASSCM_USERNAME:   $input_username\n",
+      "DASSCM_PASSWORD:   (hidden)\n", "DASSCM_PROD:       $DASSCM_PROD\n",
+      "DASSCM_REPO:       $DASSCM_REPO\n",
+      "Server Repository: $DASSCM_SVN_REPOSITORY\n", "\n", "[dasscm shell]\n\n";
+
+    exec("bash") or die "failed to start new shell";
 }
 
@@ -404 +450 @@
       run_command("diff $filename_repo $filename_prod");
     print @diff;
+}
+
+sub status(@)
+{
+    check_parameter( @_, 1 );
+    check_env();
+
+    #
+    # update local repository
+    #
+    svn_update();
+
+    # TODO: start at subdirectories ?
+    my $cvsworkdir = $DASSCM_REPO;
+
+    File::Find::find( \&cvscheck, $cvsworkdir );
+
+    # Liste der geänderten Files ausgeben, falls nicht leer
+    # Anzahl Elemente im Hash???
+    my @changedfiles = keys %status_changedfiles;
+
+    if ( %status_changedfiles or %status_removedfiles ) {
+        if (%status_removedfiles) {
+            print "deleted files:\n";
+            foreach my $key ( values %status_removedfiles ) {
+                print "$key\n";
+            }
+            print "\n";
+        }
+
+        if (%status_changedfiles) {
+            print "modified files:\n";
+            foreach my $key ( keys %status_changedfiles ) {
+                print "$key\n";
+            }
+        }
+    } else {
+        print "no modified files found in $cvsworkdir\n";
+    }
+    print "\n";
+
 }
 
@@ -472 +559 @@
         $command = "diff";
         diff(@ARGV);
+    } elsif (m/status/i) {
+        $command = "status";
+        status(@ARGV);
     } elsif (m/activate/i) {
         ## TODO
@@ -480 +570 @@
     }
 
-    # login
     # up
+    # cleanup (svn-commit.tmp)
     # commitall
     # revert