Changeset 201

Timestamp:

Jun 6, 2006, 3:02:23 PM (18 years ago)

Author:

garonne

Message:

add the touch function during checkout operation

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• doc/CMTDoc.xml (modified) (2 diffs)
• mgr/fragments/make_header (modified) (1 diff)
• source/cmt_cvs.cxx (modified) (12 diffs)
• source/cmt_system.cxx (modified) (1 diff)
• source/cmt_system.h (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+
+2006-05-31 Vincent Garonne <garonne@lal.in2p3.fr> 308
+
+        * source/cmt_cvs: Add modification to deal with non working checkout by creating the cvs files manually ,e.g. cvs entries.
+        * source/cmt_cvs: Add the "-f" option which supposes to force cvs to ignore the .cvsrc file during cvs command execution. 
+
 2006-05-20  Christian Arnault  <arnault@lal.in2p3.fr> 307
 

CMT/HEAD/doc/CMTDoc.xml

@@ -22 +22 @@
           version='&CMTVersion;'
           author='Christian Arnault'
-          email='arnault@lal.in2p3.fr'>
+          email='arnault@lal.in2p3.fr'
+>         
+<!--
+          updated by='Vincent Garonne'
+          email='garonne@lal.in2p3.fr'
+-->
+          
 
   <cmt:section title='Presentation'>
@@ -4625 +4631 @@
    load
    lock [&amp;lt;p&gt; &lt;v&gt; [&lt;path&gt;]] : lock a package
+   relocate                  : generate setup and cleanup scripts (without makefiles)
    remove &amp;lt;package&gt; &lt;version&gt; [&lt;path&gt;] : remove a package version
    remove library_links    : remove symbolic links towards all imported libraries

CMT/HEAD/mgr/fragments/make_header

@@ -108 +108 @@
 
 #-- end of make_header ------------------
+

CMT/HEAD/source/cmt_cvs.cxx

@@ -929 +929 @@
     if (structure_info == "project")
     {
-             need_version = true;              
+             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;                
+             // cout<<"need version"<<need_version<<endl;
         }
     else
@@ -1052 +1062 @@
     cout << "  # get project files into " << dir << endl;
 
+
     cmt_string version_dir = version;
-
     if (!mkdir (version_dir)) return (false);
 
@@ -1059 +1069 @@
     dir += version_dir;
     
-    cmt_string command = "cvs -Q co -P ";
+    cmt_string command = "cvs -f -Q co -P ";
     if (!at_head)
       {
@@ -1074 +1084 @@
     command += CmtSystem::command_separator ();
 
-    command += " cvs update -l .";
+    command += " cvs -f update -l .";
 
     execute_and_retry (command, "Error getting project CMT contents");
@@ -1192 +1202 @@
         text.write (entries_file_name);
       }
-
   }
 
@@ -1268 +1277 @@
     if (branches == "")
       {
-        branches = branches_info;
+            branches = branches_info;
       }
     
@@ -1313 +1322 @@
         make_management_files (module, text);
 
+        if (need_touch_files)
+        {  
+    
+            cout << "# --> udapte the file timestamps" << endl;                 
+            for (i = 0; i < branch_vector.size (); i++)
+            {   
+                    cmt_string& branch = branch_vector[i];    
+                CmtSystem::cmt_string_vector& list = CmtSystem::scan_dir (branch);
+                int j;
+                for (j = 0; j < list.size (); j++)
+                    if (CmtSystem::test_file(list[j]))                
+                        CmtSystem::touch_file (list[j]);
+            }
+        }        
         return (true);   
       }
@@ -1339 +1362 @@
     execute_and_retry (command, "Error getting package contents");
 
+    if (need_touch_files)
+    {  
+    
+        cout << "# --> udapte the file timestamps" << endl;                 
+        for (i = 0; i < branch_vector.size (); i++)
+        {       
+                cmt_string& branch = branch_vector[i];    
+            CmtSystem::cmt_string_vector& list = CmtSystem::scan_dir (branch);
+            int j;
+            for (j = 0; j < list.size (); j++)
+                if (CmtSystem::test_file(list[j]))                
+                    CmtSystem::touch_file (list[j]);
+        }
+    }        
     return (true);
   }
@@ -2059 +2096 @@
     cout << "   -o offset Offset in the CVS repository" << endl;
     cout << "   -requirements <requirements file path>  Check out packages referenced in this requirements file" << endl;
+    cout << "   -t  Change file timestamps to the date of checkout" << endl;
     cout << "   -n        simulation mode on" << endl;
     cout << "   -v        verbose mode on" << endl;
@@ -2228 +2266 @@
     cmt_string module;
     
-    m_recursive = false;
+    m_recursive      = false;
+    need_touch_files = false;
     
     bool need_version_tag = false;
     cmt_string version_tag;
+    
     
     bool need_checkout_dir = false;
@@ -2297 +2337 @@
                 m_recursive = true;
               }
+            else if (option == "-t")
+            {   
+               need_touch_files = true;
+            }  
             else if (option == "-l")
               {
@@ -2351 +2395 @@
 
   bool m_recursive;
+  bool need_touch_files;
   bool m_head;
   bool m_verbose;

CMT/HEAD/source/cmt_system.cxx

@@ -413 +413 @@
   return ((s1 == s2));
 }
+
+//--------------------------------------------------
+//
+// Function use to change file timestamps
+//
+//--------------------------------------------------
+bool CmtSystem::touch_file (const cmt_string& name)
+{
+    if (CmtSystem::test_file(name))
+       {
+            FILE* f = fopen (name, "a+");
+            if (f != NULL)
+            {
+                 cmt_string empty = " ";
+                 empty.write(f);
+                 fclose (f);
+                 return true;
+             }    
+        }
+    return false;
+}
+    
 
 //--------------------------------------------------

CMT/HEAD/source/cmt_system.h

@@ -59 +59 @@
     /**
      * Implementation of the "test -f" equivalent
-     */
+     */               
   static bool test_file (const cmt_string& name);
+    /**
+     * Implementation of the "touch" function equivalent
+     */               
+  static bool touch_file (const cmt_string& name);    
     /**
      * Check if the file "name1" is identical to "name2"