Changeset 411 for CMT/HEAD/source/cmt_cvs.cxx

Timestamp:

Apr 24, 2007, 11:44:34 PM (17 years ago)

Author:

arnault

Message:

Management of the -quiet option
Bug fixing in cmt_cvs.cxx
CL 329

File:

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

CMT/HEAD/source/cmt_cvs.cxx

@@ -1952 +1952 @@
                            const cmt_string& version_tag)
   {
+    if (m_verbose)
+      {
+        cerr << "#CMT> checkout phase1 module=" << module
+             << " version_dir=" << version_dir << " version_tag=" << version_tag << endl;
+      }
+
     add_cmtpath (m_home_dir);
 
@@ -1988 +1994 @@
     if (version_tag == "")
       {
-        Cut cut (0);
-        
-        if (tags_top_info != "") tag = tags_top_info;
-        else tag = tags_info;
-        
-        cut.run (tag);
-        
-        tag = cut.result ();
+        // No version tag is specified
+        // we need to discard all CVS branches
+        //
+        cmt_string versions = "";
+
+        if (cvsversions_top_info != "")
+          {
+            versions = cvsversions_top_info;
+            versions += " ";
+          }
+
+        versions += cvsversions_info;
+
+        static CmtSystem::cmt_string_vector words;
+
+        // Get all <tag>:<version> items
+
+        CmtSystem::split (versions, " \t", words);
+
+        for (int i = 0; i < words.size (); i++)
+          {
+            // split to get <tag> and <version> separately
+
+            static CmtSystem::cmt_string_vector vts;
+            CmtSystem::split (words[i], ":", vts);
+
+            cmt_string t = vts[0];
+            cmt_string v = vts[1];
+
+            // Split to count the number of items for the CVS version
+
+            static CmtSystem::cmt_string_vector ds;
+            CmtSystem::split (v, ".", ds);
+
+            if (ds.size () == 2)
+              {
+                tag = t;
+                break;
+              }
+          }
       }
     else