Changeset 271

Timestamp:

Mar 4, 2009, 9:40:36 PM (16 years ago)

Author:

joergs

Message:

added specific function commit, to handle things more like plain svn

File:

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

trunk/dasscm/dasscm

@@ -323 +323 @@
 
 
+sub copy_file_to_repository( $ )
+{
+    my $filename = shift;
+
+    (
+        my $basename,
+        my $dirname_prod,
+        my $dirname_repo,
+        my $filename_prod,
+        my $filename_repo
+    )
+    = get_filenames( $filename );
+
+    # TODO: are permissions also copied?
+
+    print "$filename: $filename_prod, $filename_repo\n";
+    copy( $filename_prod, $filename_repo )
+        or error "failed to copy $filename_prod to repository: $!";
+}
+
 
 #
@@ -494 +514 @@
 
 
-sub svn_getStoredFiles( ;@ )
+sub svn_ls( ;@ )
 {
     (
@@ -508 +528 @@
     # ( my $rc, my @result ) = run_command("$SVN ls --recursive $svnCheckoutCredentials $path");
 
-    # without the last true, run_command returns an error, if result is empty (?)
-    # TODO: replace by perl find
-    ( my $rc, my @result ) =
-      run_command(
-        "cd $dirname_repo && find | grep -v '/.svn' | sed -e 's|\.\\/||' | grep -v '^[\.]\$'; true"
-      );
-    if ( $rc != 0 ) {
-        print @result;
-        fatalerror('failed to get stored files');
-    }
-    chomp(@result);
-    return @result;
+    my @files  = ();
+    my @links  = ();
+    my @dirs   = ();
+    my @others = ();
+
+    if( -f $filename_prod ) {
+        @files = ( $filename_prod );
+    } elsif ( -d $dirname_repo ) {
+        find(
+            {
+                wanted => sub {
+                    my $name = $File::Find::name;
+                    $name =~ s|^$dirname_repo||;
+                    if ( $name =~ m/\.svn/ ) {
+                        # skip svn meta data
+                    } elsif ( -l $_ ) {
+    
+                        # soft link
+                        # important: check for links first
+                        #   to exclude them from further checks
+                        push( @links, $name );
+                    } elsif ( -d $_ ) {
+    
+                        # directories
+                        push( @dirs, $name );
+                    } elsif ( -f $_ ) {
+    
+                        # regular file
+                        push( @files, $name );
+                    } else {
+                        push( @others, $name );
+                    }
+                    }
+            },
+            ( $dirname_repo )
+        );
+    }
+
+    return @files;
 }
 
@@ -534 +581 @@
       = get_filenames( $_[0] );
 
-    my @files = svn_getStoredFiles( $dirname_prod );
+    my @files = svn_ls( $filename_prod );
 
     # stores result from status (cvscheck)
@@ -545 +592 @@
         foreach my $file (@files) {
 
-            my $realfile    = "/" . $file;
-            my $cvsworkfile = "${DASSCM_REPO}/${file}";
+            my $realfile    = $dirname_prod . $file;
+            my $cvsworkfile = $dirname_repo . $file;
 
             if ( -d $realfile ) {
@@ -590 +637 @@
                         push( @links, $fullname );
                     } elsif ( -d $_ ) {
+
+                        # directories
                         push( @dirs, $fullname );
                     } elsif ( -f $_ ) {
@@ -706 +755 @@
     check_env();
 
-    my @files = svn_getStoredFiles(@_);
+    my @files = svn_ls(@_);
 
     print join( "\n", @files );
@@ -870 +919 @@
 
 
+#
+# checks in all modified files
+#
+sub commit(@)
+{
+    check_parameter( @_, 1 );
+    check_env();
+
+    (
+        my $basename,
+        my $dirname_prod,
+        my $dirname_repo,
+        my $filename_prod,
+        my $filename_repo
+    )
+    = get_filenames( $_[0] );
+
+
+    #
+    # update local repository
+    #
+    svn_update();
+
+    ( my $refChangedFiles, my $refRemovedFiles ) = getModifiedFiles( $filename_prod );
+    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 );
+        }
+    }
+
+    # copy files one by one to local repository
+    for my $file ( keys(%changedfiles) ) {
+        copy_file_to_repository( $file );
+    }
+
+    # create new permissions file
+    permissions();
+
+    # add permissions file
+    add_helper($permissions_file);
+
+    if ( $options{'message'} ) {
+        $svnOptions .= " --message \"$options{'message'}\" ";
+    }
+
+    # commit calls $EDITOR.
+    # use "interactive" here, to display output
+    my $retcode =
+      run_interactive(
+        "$SVN commit $svnOptions --username '$DASSCM_USERNAME' $svnPasswordCredentials $DASSCM_REPO"
+      );
+}
+
+
+
 sub blame(@)
 {
@@ -979 +1088 @@
 
     my $dir   = $DASSCM_REPO;
-    my @files = svn_getStoredFiles( "/" );
+    my @files = svn_ls( "/" );
 
     if (@files) {
@@ -1093 +1202 @@
     } elsif ( (m/commit/i) || (m/checkin/i) || (m/ci/i) ) {
         $command = "commit";
-        add(@ARGV);
+        commit(@ARGV);
     } elsif (m/blame/i) {
         $command = "blame";