Changeset 891

Timestamp:

Jun 26, 2010, 12:57:52 PM (15 years ago)

Author:

joergs

Message:

cleanup

File:

• dasscm/trunk/usr/bin/dasscm (modified) (8 diffs)

dasscm/trunk/usr/bin/dasscm

@@ -11 +11 @@
 use File::Basename;
 use File::Compare;
-
-# used system("cp -a"), because File::Copy does not keep permissions
-#use File::Copy;
+## used system("cp -a"), because File::Copy does not keep permissions
+##use File::Copy;
 use File::Find;
 use File::stat;
@@ -70 +69 @@
 #           CMD
 #           USER
-#           PATH
-#           REPOPATH
+#           PATH_PROD
+#           PATH_REPO
 # require:
 #           WRITE commands that require write access (and therefore a login)
@@ -95 +94 @@
     'ls' => {
         'desc'     => [],
-        'params'   => ["REPOPATH"],
+        'params'   => ["PATH_REPO"],
         'function' => \&ls
     },
     'update' => {
         'desc'     => [],
-        'params'   => ["PATH"],
+        'params'   => ["PATH_REPO"],
         'function' => \&update
     },
     'add' => {
         'desc'     => [],
-        'params'   => ["PATH"],
+        'params'   => ["PATH_PROD"],
         'require'  => ["WRITE"],
         'function' => \&add
@@ -111 +110 @@
     'commit' => {
         'desc'     => [],
-        'params'   => ["REPOPATH"],
+        'params'   => ["PATH_REPO"],
         'require'  => ["WRITE"],
         'function' => \&commit
@@ -117 +116 @@
     'revert' => {
         'desc'     => ["revert local changes back to version from repository"],
-        'params'   => ["REPOPATH"],
+        'params'   => ["PATH_REPO"],
         'function' => \&revert
     },
     'blame' => {
-        'desc'     => [],
-        'params'   => ["PATH"],
+        'desc' => [],
+        ## TODO: only files from PATH_REPO
+        'params'   => ["PATH_REPO"],
         'function' => \&blame
     },
     'diff' => {
         'desc'     => [],
-        'params'   => ["PATH"],
+        'params'   => ["PATH_REPO"],
         'function' => \&diff
     },
     'status' => {
         'desc'     => [],
-        'params'   => ["PATH"],
+        'params'   => ["PATH_REPO"],
         'function' => \&status
     },
@@ -969 +969 @@
     my @files = glob($path);
 
-    # if only one result is available
-    # and this result is a directory,
-    # add another result entry
-    # (otherwise complete will stop here and continue with the next parameter)
     if ( $#files == 0 ) {
-        my $path = $files[0];
+
+        # if only one result is available
+        # and this result is a directory,
+        # add another result entry
+        # (directory with and withour trainling /),
+        # otherwise complete will stop here and continue with the next parameter
+        my $path = normalize_path( $files[0] );
         if ( -d $path ) {
-            push( @files, $path . "/" );
+            @files = ( substr( $path, 0, -1 ), $path );
         }
     } else {
+
         # add "/" to all directories
-        @files = map( { -d $_ && $_ ."/" || $_ } @files );
+        @files = map( { normalize_path($_) } @files );
     }
 
@@ -1566 +1569 @@
             $_ = $i;
             if (m/^$input/) {
-                my $command = get_command_uniform_name($i);
-                print $command, "\n";
+
+                #my $command = get_command_uniform_name($i);
+                #print $command, "\n";
+                print $i, "\n";
             }
         }
@@ -1576 +1581 @@
         my @params  = get_command_possible_params( $input[0] );
         if ($verbose) { print "params: ", Dumper(@params); }
-        if ( defined( $params[ $number_arguments - 2 ] )
-            && $params[ $number_arguments - 2 ] )
+
+        # arg 1:    dasscm
+        # arg 2:    command
+        # arg 3-x:  parameter, therefore parameter_number = $number_arguments - 2
+        my $parameter_number = $number_arguments - 2;
+        if ( defined( $params[$parameter_number] )
+            && $params[$parameter_number] )
         {
-            my $param = $params[ $number_arguments - 2 ];
-            if ( $param eq "PATH" ) {
+            my $param = $params[$parameter_number];
+            if ($verbose) { print "param used: ", $param, "\n"; }
+            if ( $param eq "PATH_PROD" ) {
                 complete_path( $input[ $number_arguments - 1 ] );
-            } elsif ( $param eq "REPOPATH" ) {
+            } elsif ( $param eq "PATH_REPO" ) {
                 complete_repopath( $input[ $number_arguments - 1 ] );
-            } else {
-                print "param: $param\n";
-                print Dumper($param);
             }
         }