1. mst
  2. ooo340

Commits

Jens-Heiner Rechtien  committed 9435af9

hr68: #i109408#: remove obsolete analyze command; mark SVN only commands; refuse cws cdiff on HG childworkspaces

  • Participants
  • Parent commits cc06144
  • Branches default

Comments (0)

Files changed (1)

File solenv/bin/cws.pl

View file
                         'create', 
                         'fetch',  'f', 
                         'rebase', 'rb',
-                        'analyze', 'an',
                         'query', 'q',
                         'task', 't',
                         'integrate',
                             'fetch'      => ['help', 'switch', 'milestone', 'childworkspace','platforms','quiet',
                                             'onlysolver'],
                             'rebase'     => ['help', 'milestone','commit'],
-                            'analyze'    => ['help'],
                             'query'      => ['help', 'milestone','masterworkspace','childworkspace'],
                             'task'       => ['help'],
                             'integrate'  => ['help', 'childworkspace'],
     elsif ($command eq 'rb') {
         $command = 'rebase';
     }
-    elsif ($command eq 'an') {
-        $command = 'analyze';
-    }
     elsif ($command eq 'q') {
         $command = 'query';
     }
         print STDERR "\thelp (h,?)\n";
         print STDERR "\tcreate\n";
         print STDERR "\tfetch (f)\n";
-        print STDERR "\trebase (rb)\n";
-        print STDERR "\tanalyze (an)\n";
+        print STDERR "\trebase (rb) (SVN only)\n";
         print STDERR "\tquery (q)\n";
         print STDERR "\ttask (t)\n";
-        print STDERR "\tcdiff (cd)\n";
+        print STDERR "\tcdiff (cd) (SVN only)\n";
         print STDERR "\tsetcurrent\n";
         print STDERR "\tintegrate *** release engineers only ***\n";
         print STDERR "\teisclone *** release engineers only ***\n";
 
      }
     elsif ($arg eq 'fetch') {
-        print STDERR "THE USER-INTERFACE TO THIS SUBCOMMAND IS LIKELY TO CHANGE IN FUTURE\n";
         print STDERR "fetch: fetch a milestone or CWS\n";
         print STDERR "usage: fetch [-q] [-s] [-p platforms] [-o] <-m milestone> <workspace>\n";
         print STDERR "usage: fetch [-q] [-s] [-p platforms] [-o] <-c cws> <workspace>\n";
         print STDERR "\t--quiet:                Same as -q\n";
     }
     elsif ($arg eq 'rebase') {
-        print STDERR "rebase: Rebase a child workspace to a new milestone\n";
+        print STDERR "rebase: Rebase a child workspace to a new milestone (SVN only)\n";
         print STDERR "usage: rebase <-m milestone> <workspace>\n";
         print STDERR "usage: rebase <-C> <workspace>\n";
         print STDERR "\t-m milestone:          Merge changes on MWS into CWS up to and including milestone <milestone>\n";
         print STDERR "\t--commit:               Same as -C\n"
     }
     elsif ($arg eq 'cdiff') {
-        print STDERR "cdiff: Show changes on CWS relative to current milestone\n";
+        print STDERR "cdiff: Show changes on CWS relative to current milestone (SVN only)\n";
         print STDERR "usage: cdiff [-M master] [-c child] [--files] [--modules]\n";
         print STDERR "\t-M master:\t\toverride MWS specified in environment\n";
         print STDERR "\t-c child:\t\toverride CWS specified in environment\n";
     }
 }
 
-sub do_analyze
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    print_error("not yet implemented.", 2);
-}
-
 sub do_integrate
 {
     my $args_ref    = shift;
         print_error("'$childws' is not a valid CWS name.\n", 30);
     }
 
+    if ( $cws->get_scm() eq 'HG' ) {
+        print_error("cws cdiff is not supported for mercurial based childworkspaces", 80);
+    }
     my $milestone = $cws->milestone();
     
     my $config = CwsConfig->new();