Changeset 43 for CMT

Timestamp:

Apr 26, 2005, 11:37:39 AM (19 years ago)

Author:

arnault

Message:

Improvements for cmt cvs operations WRT projects - See CL 271

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/cmt_dependencies.make (modified) (1 diff)
• mgr/requirements (modified) (1 diff)
• source/cmt_cvs.cxx (modified) (23 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2005-04-26  Christian Arnault  <arnault@lal.in2p3.fr> 271
+
+        * source/cmt_cvs.cxx: Add recursive passes for cvs co -R on projects (not completed)
+        Add support/checking of protocol level against CVS pluggin
+        Detection of non-installation of the CVS pluggin
+
+        * mgr/requirements: Add a macro cmt_cvs_protocol_level to specify
+        the expected protocol level with the CVS pluggin
+
 2005-04-25    <arnault@lal.in2p3.fr> 270
 

CMT/HEAD/mgr/cmt_dependencies.make

@@ -17 +17 @@
 cmt_pattern_cxx_dependencies =  ../source/cmt_pattern.cxx   ../source/cmt_std.h   ../source/cmt_string.h   ../source/cmt_vector.h   ../source/cmt_parser.h   ../source/cmt_regexp.h   ../source/cmt_system.h   ../source/cmt.h   ../source/cmt_map.h   ../source/cmt_pattern.h   ../source/cmt_include.h   ../source/cmt_script.h   ../source/cmt_scope_section.h   ../source/cmt_use.h   ../source/cmt_branch.h   ../source/cmt_fragment.h   ../source/cmt_group.h   ../source/cmt_constituent.h   ../source/cmt_language.h   ../source/cmt_tag.h   ../source/cmt_symbol.h   ../source/cmt_awk.h   ../source/cmt_project.h   ../source/cmt_cmtpath_pattern.h   ../source/cmt_database.h   ../source/cmt_error.h   ../source/cmt_syntax.h 
 cmt_language_cxx_dependencies =  ../source/cmt_language.cxx   ../source/cmt_std.h   ../source/cmt_string.h   ../source/cmt_vector.h   ../source/cmt_regexp.h   ../source/cmt_system.h   ../source/cmt.h   ../source/cmt_parser.h   ../source/cmt_fragment.h   ../source/cmt_language.h   ../source/cmt_branch.h   ../source/cmt_group.h   ../source/cmt_constituent.h   ../source/cmt_map.h   ../source/cmt_pattern.h   ../source/cmt_include.h   ../source/cmt_script.h   ../source/cmt_scope_section.h   ../source/cmt_use.h   ../source/cmt_tag.h   ../source/cmt_symbol.h   ../source/cmt_awk.h   ../source/cmt_project.h   ../source/cmt_cmtpath_pattern.h   ../source/cmt_database.h 
-cmt_cvs_cxx_dependencies =  ../source/cmt_cvs.cxx   ../source/cmt_std.h   ../source/cmt_string.h   ../source/cmt_vector.h   ../source/cmt_parser.h   ../source/cmt_regexp.h   ../source/cmt_system.h   ../source/cmt.h   ../source/cmt_cvs.h   ../source/cmt_awk.h 
+cmt_cvs_cxx_dependencies =  ../source/cmt_cvs.cxx   ../source/cmt_std.h   ../source/cmt_string.h   ../source/cmt_vector.h   ../source/cmt_parser.h   ../source/cmt_regexp.h   ../source/cmt_system.h   ../source/cmt.h   ../source/cmt_cvs.h   ../source/cmt_awk.h   ../source/cmt_map.h   ../source/cmt_include.h   ../source/cmt_script.h   ../source/cmt_pattern.h   ../source/cmt_scope_section.h   ../source/cmt_use.h   ../source/cmt_tag.h   ../source/cmt_symbol.h 
 cmt_group_cxx_dependencies =  ../source/cmt_group.cxx   ../source/cmt_std.h   ../source/cmt_string.h   ../source/cmt_vector.h   ../source/cmt_regexp.h   ../source/cmt_system.h   ../source/cmt.h   ../source/cmt_parser.h   ../source/cmt_group.h   ../source/cmt_branch.h   ../source/cmt_fragment.h   ../source/cmt_constituent.h   ../source/cmt_language.h   ../source/cmt_map.h   ../source/cmt_pattern.h   ../source/cmt_include.h   ../source/cmt_script.h   ../source/cmt_scope_section.h   ../source/cmt_use.h   ../source/cmt_tag.h   ../source/cmt_symbol.h   ../source/cmt_awk.h   ../source/cmt_project.h   ../source/cmt_cmtpath_pattern.h   ../source/cmt_database.h 
 cmt_database_cxx_dependencies =  ../source/cmt_database.cxx   ../source/cmt_vector.h   ../source/cmt_std.h   ../source/cmt_string.h   ../source/cmt_regexp.h   ../source/cmt_system.h   ../source/cmt.h   ../source/cmt_parser.h   ../source/cmt_branch.h   ../source/cmt_fragment.h   ../source/cmt_group.h   ../source/cmt_constituent.h   ../source/cmt_language.h   ../source/cmt_map.h   ../source/cmt_pattern.h   ../source/cmt_include.h   ../source/cmt_script.h   ../source/cmt_scope_section.h   ../source/cmt_use.h   ../source/cmt_tag.h   ../source/cmt_symbol.h   ../source/cmt_awk.h   ../source/cmt_project.h   ../source/cmt_cmtpath_pattern.h   ../source/cmt_database.h 

CMT/HEAD/mgr/requirements

@@ -638 +638 @@
 language yacc    -suffix=y -prototypes -linker=$(clink)
 language lex     -suffix=l -prototypes -linker=$(clink)
+
+#
+# Protocol level for the CVS pluggin
+#
+
+macro cmt_cvs_protocol_level "v1r1"
 
 #

CMT/HEAD/source/cmt_cvs.cxx

@@ -11 +11 @@
 #include "cmt_cvs.h"
 #include "cmt_awk.h"
+#include "cmt_symbol.h"
 
 /**
@@ -116 +117 @@
 public:
   RecursivePass2 (CvsImplementation& cvs);
+  void begin ();
+  void filter (const cmt_string& line);
+
+private:
+  CvsImplementation& m_cvs;
+};
+
+/**
+
+     RecursivePass3 : simply validate use statements in a project file
+                      and echo those that really need to be handled.
+
+ */
+class RecursivePass3 : public Awk
+{
+public:
+
+  void begin ();
+  void filter (const cmt_string& line);
+  const cmt_string& result () const;
+
+private:
+  cmt_string m_result;
+  bool m_first;
+};
+
+/**
+
+     RecursivePass4 : after filtering the use statements really perform the
+                      project checkouts.
+
+ */
+class CvsImplementation;
+class RecursivePass4 : public Awk
+{
+public:
+  RecursivePass4 (CvsImplementation& cvs);
   void begin ();
   void filter (const cmt_string& line);
@@ -157 +195 @@
     subpackages_info = "";
     subprojects_info = "";
+
+    m_protocol_level = "";
+
+    Symbol* symbol = Symbol::find ("cmt_cvs_protocol_level");
+    if (symbol != 0)
+      {
+        m_protocol_level = symbol->build_macro_value ();
+        Symbol::expand (m_protocol_level);
+      }
   }
 
@@ -179 +226 @@
           }
       }
+
+  /**
+     This function will check the protocol level with the CVS pluggin.
+     The expected level is defined in a macro (in the requirements file of CMT)
+     The protocol level characterizes the structure of the message received from the CVS pluggin
+     and depends on its version.
+
+     In order to know if the pluggin is installed AND if the support for this version is
+     installed, we checkout CVSROOT/loginfo which should contain entries with selection patterns
+
+     .cmtcvsinfos/<protocol_level>
+
+     However old versions only offer as pattern:
+
+     .cmtcvsinfos/
+
+     In this function we'll detect if the effective protocol level satisifies the 
+     level expected for this release of CMT
+   */
+  bool check_protocol ()
+  {
+    static bool done = false;
+    static bool found = true;
+
+    if (done) return (found);
+    done = true;
+
+    cmt_string cvsroot;
+        
+    CmtSystem::get_cvsroot (cvsroot);
+        
+    cmt_string command;
+        
+    command = "cvs";
+    if (cvsroot != "") 
+      {
+        command += " -d ";
+        command += cvsroot;
+      }
+    command += " -Q co -p CVSROOT/loginfo ";
+
+    if (m_verbose || m_simulation)
+      {
+        cout << "#CMT> Executing [" << command << "]" << endl;
+      }
+    
+    if (!m_simulation)
+      {
+        found = false;
+
+        cmt_string loginfo;
+
+        CmtSystem::execute (command, loginfo);
+
+        cmt_string pattern = ".cmtcvsinfos/";
+        pattern += m_protocol_level;
+
+        int pos = loginfo.find (pattern);
+
+        if (pos != cmt_string::npos)
+          {
+            found = true;
+          }
+      }
+
+    if (m_verbose)
+      {
+        if (found)
+          {
+            cout << "#CMT> Protocol level " << m_protocol_level << endl;
+          }
+        else
+          {
+            cout << "#CMT> The CVS pluggin is not installed or is not at protocol level " << m_protocol_level << endl;
+          }
+      }
+    
+    return (found);
+  }
+
+  void retreive_cvs_infos (const cmt_string& module)
+  {
+    static const cmt_string cmtcvsinfos = ".cmtcvsinfos";
+
+    cmt_string home_dir = CmtSystem::pwd ();
+        
+    //
+    // Activities related with .cmtcvsinfos will occur in a temporary directory
+    //
+    cmt_string tmp_dir = CmtSystem::getenv ("TMPDIR");
+    if (tmp_dir == "")
+      {
+        tmp_dir = CmtSystem::file_separator ();
+        tmp_dir += "tmp";
+      }
+    
+    if (!CmtSystem::cd (tmp_dir))
+      {
+        tmp_dir = home_dir;
+      }
+    
+    tmp_dir += CmtSystem::file_separator ();
+    tmp_dir += "cmtcvs";
+    {
+      cmt_string temp = CmtSystem::get_temporary_name ();
+      CmtSystem::basename (temp, temp);
+      temp.replace_all (".", "");
+      tmp_dir += temp;
+    }
+    
+    if (!CmtSystem::test_directory (tmp_dir))
+      {
+        if (!CmtSystem::mkdir (tmp_dir))
+          {
+            cout << "#CMT> Cannot create the temporary directory [" 
+                 << tmp_dir << "]" << endl;
+            return;
+          }
+      }
+    
+    //trap "rm -rf ${tmp_dir}" 0 1 2 15
+    
+    if (!CmtSystem::cd (tmp_dir))
+      {
+        cout << "#CMT> Cannot move to the temporary directory " << tmp_dir << endl;
+        
+        if (m_verbose)
+          {
+            cout << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl;
+          }
+        
+        CmtSystem::remove_directory (tmp_dir);
+        
+        return;
+      }
+    
+    if (m_verbose)
+      {
+        cout << "#CMT> cvs infos are now obtained from the temporary directory " << CmtSystem::pwd () << endl;  
+      }
+    
+    /*
+      #
+      # The script associated to such entries is supposed to :
+      #  1) extract the set of <infos> from the ${module}/cmt/requirements file
+      #  2) build an output of the form :
+      #      <infos>=info1 info2 info3 ...
+      #
+      # Currently this script can be found in
+      #
+      # ${CMTROOT}/cmt/cmt_buildcvsinfos2.sh
+      # %CMTROOT%/cmt/cmt_buildcvsinfos.py
+      #
+    */
+    
+    if (!CmtSystem::test_directory (cmtcvsinfos))
+      {
+        CmtSystem::mkdir (cmtcvsinfos);
+      }
+    
+    CmtSystem::cd (cmtcvsinfos);
+    
+    cmt_string cvsroot;
+    
+    CmtSystem::get_cvsroot (cvsroot);
+    
+    cmt_string command;
+    
+    command = "cvs";
+    if (cvsroot != "") 
+      {
+        command += " -d ";
+        command += cvsroot;
+      }
+    command += " -Q import -m cmt ";
+    
+    command += cmtcvsinfos;
+    
+    if (m_cmtcvstest)
+      {
+        command += "/cmtcvstest";
+      }
+    
+    if (m_protocol_level != "")
+      {
+        command += "/";
+        command += m_protocol_level;
+      }
+    command += "/";
+    command += module;
+    command += " CMT v1";
+    
+    if (m_verbose || m_simulation)
+      {
+        cout << "#CMT> Executing [" << command << "]" << endl;
+      }
+    
+    m_last_cvs_infos = "";
+    CmtSystem::execute (command, m_last_cvs_infos);
+    
+    if (m_verbose)
+      {
+        cout << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl;
+      }
+    
+    CmtSystem::cd (home_dir);
+    CmtSystem::remove_directory (tmp_dir);      
+  }
 
     //
@@ -205 +460 @@
   void show_cvs_infos (const cmt_string& module)
   {
-    static const cmt_string cmtcvsinfos = ".cmtcvsinfos";
-    static const cmt_string protocol_level = "/v1r1";
+    if (!check_protocol ())
+      {
+        cout << "#CMT> The CVS pluggin is not installed or is not at protocol level " << m_protocol_level << endl;
+        return;
+      }
 
     if (module == "")
@@ -225 +483 @@
         m_last_module = module;
         
-        cmt_string home_dir = CmtSystem::pwd ();
-        
-        //
-        // Activities related with .cmtcvsinfos will occur in a temporary directory
-        //
-        cmt_string tmp_dir = CmtSystem::getenv ("TMPDIR");
-        if (tmp_dir == "")
-          {
-            tmp_dir = CmtSystem::file_separator ();
-            tmp_dir += "tmp";
-          }
-        
-        if (!CmtSystem::cd (tmp_dir))
-          {
-            tmp_dir = home_dir;
-          }
-        
-        tmp_dir += CmtSystem::file_separator ();
-        tmp_dir += "cmtcvs";
-        {
-          cmt_string temp = CmtSystem::get_temporary_name ();
-          CmtSystem::basename (temp, temp);
-          temp.replace_all (".", "");
-          tmp_dir += temp;
-        }
-
-        if (!CmtSystem::test_directory (tmp_dir))
-          {
-            if (!CmtSystem::mkdir (tmp_dir))
-              {
-                cout << "#CMT> Cannot create the temporary directory [" 
-                     << tmp_dir << "]" << endl;
-                return;
-              }
-          }
-        
-        //trap "rm -rf ${tmp_dir}" 0 1 2 15
-        
-        if (!CmtSystem::cd (tmp_dir))
-          {
-            cout << "#CMT> Cannot move to the temporary directory " << tmp_dir << endl;
-            
-            if (m_verbose)
-              {
-                cout << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl;
-              }
-            
-            CmtSystem::remove_directory (tmp_dir);
-            
-            return;
-          }
-        
-        if (m_verbose)
-          {
-            cout << "#CMT> cvs infos are now obtained from the temporary directory " << CmtSystem::pwd () << endl;  
-          }
-        
-        /*
-          #
-          # The script associated to such entries is supposed to :
-          #  1) extract the set of <infos> from the ${module}/cmt/requirements file
-          #  2) build an output of the form :
-          #      <infos>=info1 info2 info3 ...
-          #
-          # Currently this script can be found in
-          #
-          # ${CMTROOT}/cmt/cmt_buildcvsinfos2.sh
-          # %CMTROOT%/cmt/cmt_buildcvsinfos.py
-          #
-        */
-        
-        if (!CmtSystem::test_directory (cmtcvsinfos))
-          {
-            CmtSystem::mkdir (cmtcvsinfos);
-          }
-        
-        CmtSystem::cd (cmtcvsinfos);
-        
-        cmt_string cvsroot;
-        
-        CmtSystem::get_cvsroot (cvsroot);
-        
-        cmt_string command;
-        
-        command = "cvs";
-        if (cvsroot != "") 
-          {
-            command += " -d ";
-            command += cvsroot;
-          }
-        command += " -Q import -m cmt ";
-
-        command += cmtcvsinfos;
-
-        if (m_cmtcvstest)
-          {
-            command += "/cmtcvstest";
-          }
-
-        command += protocol_level;
-        command += "/";
-        command += module;
-        command += " CMT v1";
-        
-        if (m_verbose || m_simulation)
-          {
-            cout << "#CMT> Executing [" << command << "]" << endl;
-          }
-        
-        m_last_cvs_infos = "";
-        CmtSystem::execute (command, m_last_cvs_infos);
-        
-        if (m_verbose)
-          {
-            cout << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl;
-          }
-        
-        CmtSystem::cd (home_dir);
-        CmtSystem::remove_directory (tmp_dir);  
+        retreive_cvs_infos (module);
       }
     
@@ -434 +574 @@
       }
     
+    grep.run (m_last_cvs_infos, "branches=");
+    
+    if (grep.result () != "")
+      {
+        branches_info = grep.result ();
+        branches_info.replace ("branches=", "");
+      }
+    else
+      {
+        branches_info = "";
+      }
+    
+    grep.run (m_last_cvs_infos, "subpackages=");
+    
+    if (grep.result () != "")
+      {
+        subpackages_info = grep.result ();
+        subpackages_info.replace ("subpackages=", "");
+      }
+    else
+      {
+        subpackages_info = "";
+      }
+    
+    grep.run (m_last_cvs_infos, "subprojects=");
+    
+    if (grep.result () != "")
+      {
+        subprojects_info = grep.result ();
+        subprojects_info.replace ("subprojects=", "");
+      }
+    else
+      {
+        subprojects_info = "";
+      }
+
     cmt_string tag_filter = CmtSystem::getenv ("CMTCVSTAGFILTER");
     
@@ -463 +639 @@
       }
     
-    grep.run (m_last_cvs_infos, "branches=");
-    
-    if (grep.result () != "")
-      {
-        branches_info = grep.result ();
-        branches_info.replace ("branches=", "");
-      }
-    else
-      {
-        branches_info = "";
-      }
-    
-    grep.run (m_last_cvs_infos, "subpackages=");
-    
-    if (grep.result () != "")
-      {
-        subpackages_info = grep.result ();
-        subpackages_info.replace ("subpackages=", "");
-      }
-    else
-      {
-        subpackages_info = "";
-      }
-    
-    grep.run (m_last_cvs_infos, "subprojects=");
-    
-    if (grep.result () != "")
-      {
-        subprojects_info = grep.result ();
-        subprojects_info.replace ("subprojects=", "");
-      }
-    else
-      {
-        subprojects_info = "";
-      }
   }
   
@@ -770 +911 @@
     cmt_string dir = currentdir;
 
-    cout << "  # get project files " << endl;
-
+    cout << "  # get project files into " << dir << endl;
+
+    if (m_simulation)
+      {
+        cout << "#CMT> Would mkdir " << version << endl;
+      }
+    else
+      {
+        if (m_verbose)
+          {
+            cout << "#CMT> About to mkdir " << version << endl;
+          }
+
+        CmtSystem::mkdir (version);
+        CmtSystem::cd (version);
+      }
+
+    dir += CmtSystem::file_separator ();
+    dir += version;
+
+    
     cmt_string command = "cvs -Q co -P ";
     if (!at_head)
@@ -779 +939 @@
       }
 
-    command += "-d ";
-    command += version;
+    command += "-d cmt ";
 
     command += " ";
@@ -1326 +1485 @@
           {
             cout << "#CMT> checkout_package> prefix=" << prefix
-                 << " package=" << package
+                 << " " << structure_info << "=" << package
                  << " specified_version=" << specified_version
                  << endl;
@@ -1348 +1507 @@
         if (version == "")
           {
-            cout << "# ================= No version specified for package " << package << endl;
+            cout << "# ================= No version specified for " << structure_info << " " << package << endl;
             return;
           }
@@ -1386 +1545 @@
             dir = build_version_directory (prefix, package, version);
 
-            cout << "# ================= Package " << package 
+            cout << "# ================= " << structure_info << " " << package 
                  << " version " << version << echo_ppath 
                  << " already installed in " << dir << endl;
@@ -1407 +1566 @@
             if (version.find ("*") != cmt_string::npos)
               {
-                cout << "# ================= Package " << package 
+                cout << "# ================= " << structure_info << " " << package 
                      << " version " << version << echo_ppath 
                      << " has wild cards and will not be considered." << endl;
@@ -1443 +1602 @@
             if (CmtSystem::test_directory (dir))
               {
-                cout << "# ================= Package " << package 
+                cout << "# ================= " << structure_info << " " << package 
                      << " version " << version << echo_ppath 
                      << " already installed." << endl;
@@ -1463 +1622 @@
           }
 
+        /*
+        if (m_verbose)
+          {
+            cout << "#CMT> pwd.4=" << CmtSystem::pwd () << " structure=" << structure_info << endl;
+          }
+        */
+
           //
           //  Now reach the newly checked out package.
@@ -1469 +1635 @@
         if (m_simulation)
           {
-            cout << "#CMT> Package directory not really created " << dir << endl;
-          }
-        else
+            cout << "#CMT> " << structure_info << " directory not really created " << dir << endl;
+          }
+        else if (structure_info == "package")
           {
             if (!CmtSystem::cd (dir))
@@ -1547 +1713 @@
               }
           }
+        else if (structure_info == "project")
+          {
+
+            if (m_verbose)
+              {
+                cout << "#CMT> dir=" << dir << endl;
+              }
+
+            if (!CmtSystem::cd (dir))
+              {
+                cout << "#CMT> Project directory not created " << dir << endl;
+              }
+
+            cmt_string file_name;
+            
+            file_name = "cmt";
+            file_name += CmtSystem::file_separator ();
+            file_name += "project.cmt";
+            
+            if (!CmtSystem::test_file (file_name))
+              {
+                cout << "# " << package << " not a CMT project" << endl;
+                return;
+              }
+
+            if (recursive)
+              {
+                checkout_from_project_file (file_name);
+              }
+          }
       }
 
@@ -1566 +1762 @@
     RecursivePass2 p2 (*this);
     p2.run (p1.result ());
+  }
+
+  /**
+   *   We provide a path to a project file. From it we read the use 
+   *  statements, and we try to checkout the corresponding projects.
+   */
+  void checkout_from_project_file (const cmt_string& file_name)
+  {
+    static cmt_regexp expression ("^[ \t]*use[ \t]");
+
+    cmt_string text;
+
+    text.read (file_name);
+
+    RecursivePass3 p3;
+    p3.run (text, expression);
+
+    RecursivePass4 p4 (*this);
+    p4.run (p3.result ());
   }
 
@@ -1784 +1999 @@
     if (m_verbose)
       {
-        cout << "#CMT> about to checkout package " << package << " version " << version << " into " << top_dir << endl;
+        cout << "#CMT> about to checkout " << structure_info
+             << " " << package << " version " << version << " into " << top_dir << endl;
       }
     
@@ -1806 +2022 @@
       }
     */
-    
-    cmt_string file_name;
-    
-    file_name = "cmt";
-    file_name += CmtSystem::file_separator ();
-    file_name += "requirements";
-    
-    if (CmtSystem::test_file (file_name))
-      {
-        top_dir += CmtSystem::file_separator ();
-        top_dir += "cmt";
-        CmtSystem::cd ("cmt");
-
-        /*
+
+    if (structure_info == "project")
+      {
+        cmt_string file_name;
+    
+        file_name = "cmt";
+        file_name += CmtSystem::file_separator ();
+        file_name += "project.cmt";
+        
+        if (CmtSystem::test_file (file_name))
+          {
+            cout << "#CMT> project " << package << " has been checked out" << endl;
+          }
+        else
+          {
+            cout << "# " << package << " was not properly checked out and is missing its cmt/project.cmt file" << endl;
+            return;
+          }
+      }
+    else
+      {
+        cmt_string file_name;
+    
+        file_name = "cmt";
+        file_name += CmtSystem::file_separator ();
+        file_name += "requirements";
+        
+        if (CmtSystem::test_file (file_name))
+          {
+            top_dir += CmtSystem::file_separator ();
+            top_dir += "cmt";
+            CmtSystem::cd ("cmt");
+            
+            /*
+              if (m_verbose)
+              {
+              cout << "#CMT> pwd.9=" << CmtSystem::pwd () << endl;
+              }
+            */
+          }
+        else
+          {
+            file_name = "mgr";
+            file_name += CmtSystem::file_separator ();
+            file_name += "requirements";
+            
+            if (CmtSystem::test_file (file_name))
+              {
+                top_dir += CmtSystem::file_separator ();
+                top_dir += "mgr";
+                CmtSystem::cd ("mgr");
+                
+                /*
+                  if (m_verbose)
+                  {
+                  cout << "#CMT> pwd.10=" << CmtSystem::pwd () << endl;
+                  }
+                */
+              }
+            else
+              {
+                cout << "# " << package << " was not properly checked out and is missing its cmt/requirements file" << endl;
+                return;
+              }
+          }
+        
         if (m_verbose)
           {
-            cout << "#CMT> pwd.9=" << CmtSystem::pwd () << endl;
-          }
-        */
-      }
-    else
-      {
-        file_name = "mgr";
-        file_name += CmtSystem::file_separator ();
-        file_name += "requirements";
+            cout << "#CMT> package " << package << " has been checked out" << endl;
+          }
+        
+        if (m_recursive)
+          {
+            if (m_verbose || m_simulation)
+              {
+                cout << "#CMT> Executing [" << "cmt -quiet broadcast cmt -quiet config" << "]" << endl;
+              }
+            
+            if (!m_simulation)
+              {
+                CmtSystem::execute ("cmt -quiet broadcast cmt -quiet config");
+              }
+          }
+        else
+          {
+            if (m_verbose || m_simulation)
+              {
+                cout << "#CMT> Executing [" << "cmt -quiet config" << "]" << endl;
+              }
         
-        if (CmtSystem::test_file (file_name))
-          {
-            top_dir += CmtSystem::file_separator ();
-            top_dir += "mgr";
-            CmtSystem::cd ("mgr");
-
-            /*
-            if (m_verbose)
-              {
-                cout << "#CMT> pwd.10=" << CmtSystem::pwd () << endl;
-              }
-            */
-          }
-        else
-          {
-            cout << "# " << package << " was not properly checked out and is missing its cmt/requirements file" << endl;
-            return;
-          }
-      }
-    
-    if (m_verbose)
-      {
-        cout << "#CMT> package " << package << " has been checked out" << endl;
-      }
-
-    if (m_recursive)
-      {
-        if (m_verbose || m_simulation)
-          {
-            cout << "#CMT> Executing [" << "cmt -quiet broadcast cmt -quiet config" << "]" << endl;
-          }
-        
-        if (!m_simulation)
-          {
-            CmtSystem::execute ("cmt -quiet broadcast cmt -quiet config");
-          }
-      }
-    else
-      {
-        if (m_verbose || m_simulation)
-          {
-            cout << "#CMT> Executing [" << "cmt -quiet config" << "]" << endl;
-          }
-        
-        if (!m_simulation)
-          {
-            CmtSystem::execute ("cmt -quiet config");
+            if (!m_simulation)
+              {
+                CmtSystem::execute ("cmt -quiet config");
+              }
           }
       }
@@ -2048 +2285 @@
   cmt_string m_branch_suffix;
 
+  cmt_string m_protocol_level;
   cmt_string m_last_module;
   cmt_string m_last_cvs_infos;
@@ -2322 +2560 @@
 //--------------------------------------------------------------------
 
+void RecursivePass3::begin ()
+{
+  m_first = true;
+  m_result = "";
+}
+
+void RecursivePass3::filter (const cmt_string& line)
+{
+  History& h = History::instance ();
+  
+  if (h.is_installed (line)) return;
+  
+  CmtSystem::cmt_string_vector words;
+  
+  CmtSystem::split (line, " \t", words);
+
+  enum
+  {
+    need_project,
+    need_version,
+    no_need
+  } state = need_project;
+
+  cmt_string project;
+  cmt_string version;
+
+  for (int i = 1; i < words.size (); i++)
+    {
+      const cmt_string& s = words[i];
+
+      switch (state)
+        {
+          case need_project:
+            project = s;
+            state = need_version;
+            break;
+          case need_version:
+            version = s;
+            state = no_need;
+            break;
+        }
+    }
+  
+  if (version.find ("*") != cmt_string::npos)
+    {
+        /*
+      cout << "# ================= Project " << project 
+           << " version " << version << " " << path 
+           << " has wild cards and will not be considered." << endl;
+        */
+      return;
+    }
+
+  /**
+   *  At the first pass, we simply accumulate the not-yet handled
+   *  use statements.
+   */
+  
+  m_result += line;
+  m_result += "\n";
+  
+  if (m_first)
+    {
+      m_first = false;
+      cout << "  # --> now propagate cmt checkout to :" << endl;
+    }
+  
+  cout << "  #     " << project << " " << version << endl;
+}
+
+const cmt_string& RecursivePass3::result () const
+{
+  return (m_result);
+}
+
+//--------------------------------------------------------------------
+
+RecursivePass4::RecursivePass4 (CvsImplementation& cvs) : m_cvs (cvs)
+{
+}
+
+void RecursivePass4::begin ()
+{
+}
+
+void RecursivePass4::filter (const cmt_string& line)
+{
+    //if (CmtSystem::testenv ("CMTTESTAWK")) cout << "RecursivePass4::filter> " 
+    //                                          << "line=[" << line << "]" << endl;
+
+  /**
+   *   At the second pass, the lines are really handled. Thus
+   *   the lines are stored into m_installed so as to avoid
+   *   later on re-installation.
+   */
+  
+  History& h = History::instance ();
+  
+  if (h.is_installed (line)) return;
+  
+  h.install (line);
+  
+  CmtSystem::cmt_string_vector words;
+  
+  CmtSystem::split (line, " \t", words);
+
+  enum
+  {
+    need_project,
+    need_version,
+    no_need
+  } state = need_project;
+
+  cmt_string project;
+  cmt_string version;
+
+  for (int i = 1; i < words.size (); i++)
+    {
+      const cmt_string& s = words[i];
+
+      switch (state)
+        {
+          case need_project:
+            project = s;
+            state = need_version;
+            break;
+          case need_version:
+            version = s;
+            state = no_need;
+            break;
+        }
+    }
+
+  if (version.find ("*") != cmt_string::npos)
+    {
+        /*
+      cout << "# ================= Project " << project 
+           << " version " << version
+           << " has wild cards and will not be considered." << endl;
+        */
+    }
+  else
+    {
+      m_cvs.checkout_package ("", project, version);
+    }
+}
+
+//--------------------------------------------------------------------
+
 void Cvs::tags (const CmtSystem::cmt_string_vector& arguments)
 {