Changeset 200

Timestamp:

Jun 2, 2006, 10:43:50 PM (19 years ago)

Author:

garonne

Message:

better support for succesive checkout

File:

• CMT/HEAD/source/cmt_cvs.cxx (modified) (14 diffs)

CMT/HEAD/source/cmt_cvs.cxx

@@ -2 +2 @@
 // Copyright Christian Arnault LAL-Orsay CNRS
 // arnault@lal.in2p3.fr
+// Modified by: garonne@lal.in2p3.fr
 // See the complete license in cmt_license.txt "http://www.cecill.info". 
 //-----------------------------------------------------------
@@ -317 +318 @@
       {
         status = CmtSystem::execute (command, out);
-      }
-
+        
+      }
+      
+    //if (m_verbose || m_simulation)
+    //  {
+    //       cout << out << endl;
+    //  }
     return (status);
   }
@@ -827 +833 @@
     if (m_verbose)
       {
-        cout << "#CMT> requesting cvs infos onto module " << module << endl;
+             cout << "#CMT> requesting cvs infos onto module " << module << endl;
       }
     
@@ -919 +925 @@
   bool do_need_version ()
   {
-    bool need_version = false;
+     bool need_version = false;
 
     if (structure_info == "project")
-      {
-        need_version = true;
-      }
+    {
+             need_version = true;              
+        }
     else
       {
-        CmtStructuringStyle style = Cmt::get_current_structuring_style ();
-
-        if (style == default_structuring_style)
-          {
-            Use& current_use = Use::current ();
-            if (current_use.get_strategy ("VersionDirectory"))
-              {
-                need_version = true;
-              }
-          }
-        else if (style == with_version_directory)
-          {
-            need_version = true;
-          }
+             CmtStructuringStyle style = Cmt::get_current_structuring_style ();
+         if (style == default_structuring_style)
+             {
+                Use& current_use = Use::current ();
+                if (current_use.get_strategy ("VersionDirectory"))
+                   need_version = true;
+             }
+             else if (style == with_version_directory)
+                 need_version = true;           
       }
 
@@ -1246 +1247 @@
     if (need_version)
       {
-        if (!mkdir (version)) return (false);
-        
-        dir += CmtSystem::file_separator ();
-        dir += version;
+               if (!mkdir (version)) return (false);    
+               dir += CmtSystem::file_separator ();
+               dir += version;
       }
     else
@@ -1281 +1281 @@
     if (!CmtSystem::test_directory ("CVS"))
       {
-          cout << "#CMT> CVS repository is missing !!" << endl;  
           int i;
           for (i = 0; i < branch_vector.size (); i++)
@@ -1419 +1418 @@
   cmt_string find_matching_version (const cmt_string& expression)
   {
-    cmt_string result;
-
+      
+    cmt_string result;     
+    
     //
     // Here expression takes the form
@@ -1541 +1541 @@
      given by the structure info obtained from the most recent request to the CVS pluggin
    */
-  bool check_structure (const cmt_string& dir)
+  bool check_structure (const cmt_string& dir, const cmt_string& version)
   {
     bool result = false;
-
     if (!CmtSystem::test_directory (dir))
       {
-        return (false);
+               return (false);
       }
 
     if (structure_info == "package")
       {
-        // Check if it is a true CMT package.
-        
+        // Check if it is a true CMT package.   
         cmt_string file_name;
         
@@ -1563 +1561 @@
         
         if (CmtSystem::test_file (file_name))
-          {
-            result = true;
+          {       
+               if (!do_need_version ())
+               {
+                   // open the version.cmt file and compare the version
+                 cmt_string current_version;
+                 cmt_string version_file = dir;
+                 version_file += CmtSystem::file_separator ();
+                 version_file += "CVS";
+                 version_file += CmtSystem::file_separator ();
+                 version_file += "Tag"; 
+                 current_version.read (version_file);               
+                 //cout <<version_file<<", "<<current_version<<", "<<"N"+version+"\n"<<endl;
+                 return current_version=="N"+version+"\n";                  
+                }   
+                else
+                       result = true;
           }
         else
           {
+
             file_name = dir;
             file_name += CmtSystem::file_separator ();
@@ -1576 +1589 @@
             if (CmtSystem::test_file (file_name))
               {
-                result = true;
+               if (!do_need_version ())
+               {
+                   // open the version.cmt file and compare the version
+                 cmt_string current_version;
+                 cmt_string version_file = dir;
+                 version_file += CmtSystem::file_separator ();
+                 version_file += "CVS";
+                 version_file += CmtSystem::file_separator ();
+                 version_file += "Tag"; 
+                 current_version.read (version_file);               
+                 //cout <<version_file<<", "<<current_version<<", "<<"N"+version+"\n"<<endl;
+                 return current_version=="N"+version+"\n";                  
+                }   
+                else
+                       result = true;
               }
           }
@@ -1594 +1621 @@
             result = true;
           }
-      }
+    }
 
     return (result);
@@ -1660 +1687 @@
     bool recursive = m_recursive;
     
-    cmt_string effective_version = find_matching_version (dir);
-    
+    cmt_string effective_version = "";
+    if (do_need_version ())
+    {
+    /* Important this part should be enhanced ASAP 
+       and deal with many other cases.... arghhhh !!
+    */    
+        effective_version = find_matching_version (dir);         
+    }
+
+
+         
     cmt_string module;
     get_module (full_offset, product, module);
@@ -1716 +1752 @@
             // If tag was not specified, then the version directory has to match the CVS tag
             // Otherwise the original version specification is kept for the directory.
-
             version = cvs_tag;
             dir = build_version_directory (offset, product, version);
@@ -1722 +1757 @@
       }
     
-
-    if (check_structure (dir))
-      {
-        cout << "# ================= " << structure_info << " " << product 
-             << " version " << version << echo_ppath 
-             << " already installed." << endl;
-        
-        recursive = false;
+    if (check_structure (dir, version))
+      {
+             cout << "# ================= " << structure_info << " " << product 
+                  << " version "            << version        << echo_ppath 
+                  << " already installed."  << endl;    
+             recursive = false;
       }
     else