Changeset 190

Timestamp:

May 29, 2006, 12:10:28 PM (18 years ago)

Author:

garonne

Message:

correct check out operation

Location:

CMT/HEAD/source

Files:

• cmt_awk.cxx (modified) (9 diffs)
• cmt_cvs.cxx (modified) (1 diff)

CMT/HEAD/source/cmt_awk.cxx

@@ -609 +609 @@
 void PathScanner::scan_path (const cmt_string& path, int level, actor& a)
 {
-  if (level > 10)
-    {
-      cout << "#PathScanner::scan_path> too deep search path=" << path << endl;
+  if (level > 2)
+    {
+      //cout << "#PathScanner::scan_path> too deep search path=" << path << endl;
       return;
     }
@@ -655 +655 @@
 
       if ((level == 0) && (entry == "InstallArea")) continue;
+      if (entry == "CVS") continue;
 
       cmt_string req;
@@ -678 +679 @@
           has_package = true;
 
+          // We don't keep on looking in this directory since the versioned structure
+          // does not expect subpackages there
           continue;
         }
@@ -720 +723 @@
               a.run (entry, version, path, true);
               has_package = true;
-              
+
+              // We scan further down
+              scan_path (here, 1, a);
               continue;
             }
 
           cmt_string p;
-
+          
           p.read (req);
           int pos;
@@ -740 +745 @@
               if (p != "") name = p;
             }
-
+          
           if (name != "")
             {
               // The package name was specified in the requirements file
-
+              
               if (entry == name)
                 {
                   // The structure is without the version directory.
-
+                  
                   //cout << "#3" << endl;
-
+                  
                   a.run (name, "v1", path);
                   has_package = true;
                   
+                  // We scan further down
+                  scan_path (here, 1, a);
                   continue;
                 }
@@ -764 +771 @@
                   // The structure is with the version directory.
                   
-                  // cout << "#4" << endl;
-
+                  //cout << "#4" << endl;
+                  
                   a.run (name, version, where);
                   has_package = true;
@@ -771 +778 @@
                   continue;
                 }
-
+              
               // No directory structure matches the package name
               // Is it a typo in the requirements file ?
@@ -781 +788 @@
               CmtSystem::basename (path, entry);
             }
-
+          
           // The package name is not specified in the requirements file
           // or did not match the directory structure
           // We'll have to guess it from the structure
-              
+          
           if (CmtSystem::is_version_directory (version))
             {
               //cout << "#5" << endl;
-
+              
               a.run (entry, version, where);
               has_package = true;
@@ -796 +803 @@
             }
 
+          // Here we suppose that the directory up is the package name
+          // although no specification of the version has been found
+          // So we decide that
+          // - it's a non-versioned structure
+          // - the version is set by default to v1
           name = version;
-
+          
           where += CmtSystem::file_separator ();
           where += entry;
-
+          
           //cout << "#6" << endl;
-
+          
           a.run (name, "v1", where);
           has_package = true;
           
+          // We scan further down
+          scan_path (here, 1, a);
           continue;
         }
 
+      //
+      // Here this is a non-package directory. Let's search further down
       //cout << "#7" << endl;
 

CMT/HEAD/source/cmt_cvs.cxx

@@ -1100 +1100 @@
     cout << "  # get top files " << endl;
             
-    cmt_string command = "cvs -Q co -P -l ";
+    cmt_string command = "cvs -Q co -l ";
     if (!at_head)
       {