Changeset 237

Timestamp:

Oct 8, 2008, 8:49:03 PM (16 years ago)

Author:

joergs

Message:

handle directories in add

File:

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

trunk/dasscm/dasscm

@@ -12 +12 @@
 use File::Compare;
 use File::Copy;
+use File::Find;
 use File::stat;
 use File::Path;
@@ -36 +37 @@
 my $svnCheckoutCredentials = "";
 my $svnPasswordCredentials = "";
+my $DIFF                   = "diff --exclude .svn ";
 
 # command line options get stored in options hash
@@ -218 +220 @@
 {
     my $filename_prod = $_[0];
+
+    # remove leading './' from relative directories
+    #$filename_prod =~ s/^\.\///;
+
     if ( !( $filename_prod =~ m/^\// ) ) {
         $filename_prod = cwd() . "/" . $filename_prod;
@@ -224 +230 @@
     if( not -r $filename_prod ) {
         fatalerror( $filename_prod  . " is not accessable" );
-    } elsif( -l $filename_prod ) {
-        my $dest = readlink($filename_prod);
-        # TODO:
-        #   default: disallow, but offer cmd switch to activate
-        #   (or check, if file is already checked in and has been a link before)
-        warning( "'$filename_prod' is a link to '$dest'.", "Please check, if '$dest' should be stored in repository instead" );
-        if( ! -f $dest ) {
-            fatalerror( "link target '$dest' is not a regular file. Giving up" );
-        }
-    } elsif( ! -f $filename_prod ) {
-        fatalerror( $filename_prod . " is not a regular file. Only regular files can be checked in." );
-    }
+    }
+    #      elsif( -l $filename_prod ) {
+    #         my $dest = readlink($filename_prod);
+    #         # TODO:
+    #         #   default: disallow, but offer cmd switch to activate
+    #         #   (or check, if file is already checked in and has been a link before)
+    #         warning( "'$filename_prod' is a link to '$dest'.", "Please check, if '$dest' should be stored in repository instead" );
+    #         if( ! -f $dest ) {
+    #             fatalerror( "link target '$dest' is not a regular file. Giving up" );
+    #         }
+    #     } elsif( ! -f $filename_prod ) {
+    #         #fatalerror( $filename_prod . " is not a regular file" );
+    #     }
 
     # TODO: dirname buggy: eg. "/etc/" is reduced to "/",
     #   "/etc" is used as filename
     my $dirname_prod = dirname($filename_prod);
+    my $oldpath = cwd();
     chdir $dirname_prod or die $!;
     $dirname_prod = cwd();
+    chdir $oldpath;
     my $basename = basename($filename_prod);
 
@@ -407 +416 @@
 }
 
+
+sub get_files( @ )
+{
+    my @files  = ();
+    my @links  = ();
+    my @dirs   = ();
+    my @others = ();
+
+    if( @_ ) {
+        find( { wanted => sub {
+            my $fullname = cwd() . "/" . $_;
+            if ( -l $_ ) {
+                # soft link
+                # important: check for links first
+                #   to exclude them from further checks
+                push( @links, $fullname );
+            } elsif ( -d $_ ) {
+                push( @dirs, $fullname );
+            } elsif( -f $_ ) {
+                # regular file
+                push( @files, $fullname );
+            } else {
+                push( @others, $fullname );
+            }
+        } }, @_ );
+    }
+
+    # don't rely on others. 
+    # If more specific file types are needed,
+    # they will be added
+    return {
+        files   => \@files,
+        links   => \@links,
+        dirs    => \@dirs,
+        others  => \@others
+     };
+}
+
+
+
 #####################################################################
 #
@@ -502 +551 @@
 }
 
+
+
+#
+# helper function for "add" command
+#
 sub add_helper(@)
 {
@@ -517 +571 @@
     }
 
-    copy( $filename_prod, $filename_repo ) or die "failed to copy $filename_prod to repository: $!";
+    copy( $filename_prod, $filename_repo ) or error "failed to copy $filename_prod to repository: $!";
 
     if ( $command eq "add" ) {
 
+        my $oldpath = cwd();
         # already checked in?
         chdir($DASSCM_REPO);
@@ -538 +593 @@
             print join( "\n", @out );
         } 
-    }
-}
+        chdir($oldpath);
+    }
+}
+
 
 #
@@ -554 +611 @@
     svn_update();
 
-    # TODO: check all files
-
-    for my $file (@_) {
+    # get all regular files and links
+    my $href_files = get_files( @_ );
+
+    #print Dumper( $href_files );
+
+    my @files = @{$href_files->{files}};
+    my @links = @{$href_files->{links}};
+
+    if( @files ) {
+        my $number = $#files + 1;
+        print "files to check-in ($number): \n";
+        print join( "\n", @files );
+        print "\n";
+    }
+
+    if( @links ) {
+        my $number = $#links + 1;
+        print "\n";
+        print "ignoring links ($number):\n";
+        print join( "\n", @links );
+        print "\n";
+    }
+
+    # copy files one by one to local repository
+    for my $file (@files) {
         # add file
         add_helper( $file );
@@ -571 +650 @@
     }
 
-    # commit calls $EDITOR. uses "interactive" here, to display output
+    # commit calls $EDITOR. 
+    # use "interactive" here, to display output
     my $retcode =
       run_interactive(
@@ -621 +701 @@
 
     ( my $rc_diff, my @diff ) =
-      run_command("diff $filename_repo $filename_prod");
+      run_command( $DIFF . " $filename_repo $filename_prod");
     print @diff;
 }