Changeset 239 for trunk

Timestamp:

Oct 9, 2008, 12:07:00 AM (16 years ago)

Author:

joergs

Message:

perltidy

File:

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

trunk/dasscm/dasscm

@@ -16 +16 @@
 use File::Path;
 use Term::ReadKey;
+
 #use Data::Dumper;
 
@@ -80 +81 @@
       "    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";
+      "  If dasscm is not yet configured, read", "  $doc_file\n";
 }
 
@@ -96 +96 @@
 sub fatalerror(@)
 {
-    error( @_ );
+    error(@_);
+
     #print "Exiting\n";
-    exit 1
-}
-
+    exit 1;
+}
 
 #
@@ -107 +107 @@
 sub get_config
 {
-    my $file   = $_[0];
-
-    if( ! $file ) {
+    my $file = $_[0];
+
+    if ( !$file ) {
         fatalerror( "failed to open config file" . $file );
     }
@@ -125 +125 @@
             }
             if ( $_ =~ /=/g ) {
+
                 # splitting in 2 fields at maximum
                 my ( $option, $value ) = split( /=/, $_, 2 );
@@ -145 +146 @@
 }
 
-
 sub check_env()
 {
@@ -178 +178 @@
 
     #
-    # check if local repository directory exist 
+    # check if local repository directory exist
     # (if not creating by init)
     #
@@ -224 +224 @@
 }
 
-
-#
-# generate from (relative) filename 
+#
+# generate from (relative) filename
 # all required file and directory names:
 # $basename,      $dirname_prod, $dirname_repo,
@@ -240 +239 @@
     }
 
-    if( not -r $filename_prod ) {
-        fatalerror( $filename_prod  . " is not accessable" );
+    if ( not -r $filename_prod ) {
+        fatalerror( $filename_prod . " is not accessable" );
     }
 
@@ -277 +276 @@
     foreach my $file (@files) {
         $file = "/" . $file;
-        if( -e $file ) {
-            my $info       = stat( $file ) || die "failed to stat $file: aborting";
-            my $mode       = get_type( $info->mode ) & 07777;
+        if ( -e $file ) {
+            my $info = stat($file) || die "failed to stat $file: aborting";
+            my $mode = get_type( $info->mode ) & 07777;
             my $modestring = sprintf( "%04o", $mode );
             my $uid        = $info->uid;
@@ -291 +290 @@
             );
         } else {
-            print "failed to get status of $file. It exists in the repository, but not on the system\n";
+            print
+              "failed to get status of $file. It exists in the repository, but not on the system\n";
         }
     }
@@ -364 +364 @@
     print "checking credentials ... ";
 
-    if( ! $username ) {
-        fatalerror( "no username given" );
-    }
-
-    if( ! $password ) {
-        fatalerror( "no password given" );
+    if ( !$username ) {
+        fatalerror("no username given");
+    }
+
+    if ( !$password ) {
+        fatalerror("no password given");
     }
 
@@ -426 +426 @@
 }
 
-
 #
 # from an array of files/dirs,
@@ -439 +438 @@
     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 (@_) {
+        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
-     };
-}
-
-
+        files  => \@files,
+        links  => \@links,
+        dirs   => \@dirs,
+        others => \@others
+    };
+}
 
 #####################################################################
@@ -511 +515 @@
     print "\n";
 
-    svn_check_credentials( $input_username || $DASSCM_USERNAME, $input_password );
+    svn_check_credentials( $input_username || $DASSCM_USERNAME,
+        $input_password );
 
     #
@@ -565 +570 @@
     svn_update();
 }
-
-
 
 #
@@ -587 +590 @@
 
     # TODO: are permissions also copied?
-    copy( $filename_prod, $filename_repo ) or error "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" ) {
@@ -597 +601 @@
         for my $dir ( split( '/', $dirname_prod ) ) {
             if ($dir) {
-                my( $rc, @out ) = run_command("$SVN add --non-recursive \"" . $dir . "\"" );
-                if( $rc > 0 ) {
+                my ( $rc, @out ) =
+                  run_command( "$SVN add --non-recursive \"" . $dir . "\"" );
+                if ( $rc > 0 ) {
                     print join( "\n", @out );
-                } 
+                }
                 chdir $dir;
             }
         }
-        my( $rc, @out ) = run_command("$SVN add \"" . $basename . "\"");
-        if( $rc > 0 ) {
+        my ( $rc, @out ) = run_command( "$SVN add \"" . $basename . "\"" );
+        if ( $rc > 0 ) {
             print join( "\n", @out );
-        } 
+        }
         chdir $StartDirectory;
     }
 }
-
 
 #
@@ -627 +631 @@
 
     # get all regular files and links
-    my $href_files = get_files( @_ );
+    my $href_files = get_files(@_);
 
     #print Dumper( $href_files );
 
-    my @files = @{$href_files->{files}};
-    my @links = @{$href_files->{links}};
-
-    if( @files ) {
+    my @files = @{ $href_files->{files} };
+    my @links = @{ $href_files->{links} };
+
+    if (@files) {
         my $number = $#files + 1;
         print "files to check-in ($number): \n";
@@ -641 +645 @@
     }
 
-    if( @links ) {
+    if (@links) {
         my $number = $#links + 1;
         print "\n";
@@ -653 +657 @@
     # copy files one by one to local repository
     for my $file (@files) {
+
         # add file
-        add_helper( $file );
+        add_helper($file);
     }
 
@@ -667 +672 @@
     }
 
-    # commit calls $EDITOR. 
+    # commit calls $EDITOR.
     # use "interactive" here, to display output
     my $retcode =
@@ -718 +723 @@
 
     ( my $rc_diff, my @diff_result ) =
-      run_command( $diff . " $filename_repo $filename_prod");
+      run_command( $diff . " $filename_repo $filename_prod" );
 
     print @diff_result;