Changeset 454 for CMT/HEAD

Timestamp:

Apr 17, 2008, 11:00:03 AM (16 years ago)

Author:

rybkin

Message:

See C.L. 355

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_cvs.cxx (modified) (7 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-04-17    <rybkin@lal.in2p3.fr> 355
+        
+        * source/cmt_cvs.cxx: Add the -rs suffix option to the cmt checkout command
+        (proposed by David Rousseau)
+        
 2008-04-15    <rybkin@lal.in2p3.fr> 354
         

CMT/HEAD/source/cmt_cvs.cxx

@@ -2157 +2157 @@
   void help ()
   {
+    cerr << "Usage:" << endl;
     cerr << "> cd <some work area>" << endl;
-    cerr << "> cmt checkout [modifier ...] <package|project>" << endl;
+    cerr << "> cmt checkout [modifier]... <package|project>..." << endl;
     cerr << "" << endl;
     cerr << "   modifier :" << endl;
@@ -2168 +2169 @@
     cerr << "   -o offset Offset in the CVS repository" << endl;
     cerr << "   -requirements <requirements file path>  Check out packages referenced in this requirements file" << endl;
-    cerr << "   -t  Change file timestamps to the date of checkout" << endl;
+    cerr << "   -t        Change file timestamps to the date of checkout" << endl;
     cerr << "   -n        simulation mode on" << endl;
     cerr << "   -no_config  Disable config step after checkout" << endl;    
     cerr << "   -v        verbose mode on" << endl;
+    cerr << "   -rs suffix  Same as -r <packagename|projectname>suffix" << endl;
     cerr << "   --help    print this help" << endl;
+    cerr << "" << endl;
+    cerr << "(Modifiers are recognised anywhere on the command line)" << endl;
     cerr << "" << endl;
     cerr << "> cmt cvstags <package|project>" << endl;
@@ -2337 +2341 @@
     m_cvs_offset = "";
 
-    cmt_string module;
+    //cmt_string module;
     
     m_recursive      = false;
@@ -2345 +2349 @@
     bool need_version_tag = false;
     cmt_string version_tag;
+
+    bool need_version_tag_suffix = false;
+    cmt_string version_tag_suffix;
+
+    CmtSystem::cmt_string_vector modules;
     
     
@@ -2404 +2413 @@
             m_head = false;
             checkout_from_requirements (option);
+          }
+        else if (need_version_tag_suffix)
+          {
+            need_version_tag_suffix = false;
+            version_tag_suffix = option;
           }
         else
@@ -2452 +2466 @@
                 need_requirements_file = true;
               }
+            else if (option == "-rs")
+              {
+                need_version_tag_suffix = true;
+                m_head = false;
+              }
             else if (option == "--help")
               {
@@ -2464 +2483 @@
             else
               {
-                do_checkout_phase1 (option, m_version_dir, version_tag);
-              }
-          }
+                modules.push_back (option);
+                //do_checkout_phase1 (option, m_version_dir, version_tag);
+              }
+          }
+      }
+    if ( modules.size () < 1)
+      {
+        help ();
+        return;
+      }
+    for (int arg = 0; arg < modules.size (); arg++)
+      {
+        if (version_tag_suffix != "")
+          {
+            cmt_string name;
+            CmtSystem::basename (modules[arg], name);
+            version_tag = name + version_tag_suffix;
+          }
+        do_checkout_phase1 (modules[arg], m_version_dir, version_tag);
       }
   }