Changeset 411

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

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt.h (modified) (1 diff)
• source/cmt_cvs.cxx (modified) (2 diffs)
• source/cmt_parser.cxx (modified) (9 diffs)
• source/cmt_project.cxx (modified) (1 diff)
• source/cmt_system.cxx (modified) (2 diffs)
• source/cmt_system.h (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2007-04-24    <arnault@lal.in2p3.fr> 329
+
+        * source/cmt_cvs.cxx (class CvsImplementation): Don't consider CVS branches when tag is not specified
+
+        * source/cmt_project.cxx: Protect warning messages with -quiet
+
+        * source/cmt_system.cxx: idem
+        * source/cmt_system.h: Improvement of the FilePath class definition
+
+        * source/cmt_parser.cxx: Prepare using FilePath objet for current dir
+        Better management of the -quiet option
+        
+        * source/cmt.h: Prepare using FilePath objet for current dir
+
 2007-04-23    <arnault@lal.in2p3.fr> 328
 

CMT/HEAD/source/cmt.h

@@ -35 +35 @@
   
   cmt_string m_current_dir;
+  FilePath   m_current_file_path;
   cmt_string m_current_package;
   cmt_string m_current_config;

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

CMT/HEAD/source/cmt_parser.cxx

@@ -64 +64 @@
   m_cmt_version    = "";
   m_current_dir     = "";
+  m_current_file_path = "";
   m_current_package = "";
   m_current_config  = "";
@@ -77 +78 @@
   m_current_version  = "";
   m_default_path     = "";
-  m_quiet            = false;
+
+  //m_quiet            = false;
+
   m_disable_warnings = false;
   m_warnings         = false;
@@ -492 +495 @@
 void Cmt::clear ()
 {
+  Me.m_quiet = false;
   Me.clear ();
 
@@ -528 +532 @@
 
 
+  bool save_quiet = Me.m_quiet;
+  Me.m_quiet = true;
+
   Me.m_autoconfigure_cmtpath = true;
   configure_cmt_path (0);
   Me.m_autoconfigure_cmtpath = false;
 
+  Me.m_quiet = save_quiet;
 
   configure_current_dir ();
@@ -573 +581 @@
     bool q = Me.m_quiet;
     Me.m_quiet = true;  
+
     Symbol::filter_path_value ("CMTPATH", s);
+
     Me.m_quiet = q;
   }
@@ -765 +775 @@
 
   Me.m_current_dir = mount_filter.get_current_dir ();
+  Me.m_current_file_path = mount_filter.get_current_dir ();
+
+  cmt_string t = Me.m_current_file_path;
 }
 
@@ -2274 +2287 @@
 
   Me.m_quiet = true;
-
+    
   if (!reach_current_package ())
     {
@@ -4116 +4129 @@
   //cerr << "buffer = " << buffer << endl;
   Use& use = Use::current();
+
   bool save_quiet = Me.m_quiet;
   Me.m_quiet = true;
+
   SyntaxParser::parse_requirements_text (buffer, "", &use);
+
   Me.m_quiet = save_quiet;
 
@@ -4918 +4934 @@
     }
 
-
   clear ();
+
   configure ();
 

CMT/HEAD/source/cmt_project.cxx

@@ -232 +232 @@
           if (r != p.get_release ())
             {
-              cerr << "#CMT> Project " << p.get_name ()
-                   << " requested with conflicting releases " << p.get_release () << " and " << r << endl;
+              if (!Cmt::get_quiet ())
+                {
+                  cerr << "#CMT> Project " << p.get_name ()
+                       << " requested with conflicting releases " << p.get_release () << " and " << r << endl;
+                }
               CmtError::set (CmtError::project_release_conflict, p.get_name ());
             }

CMT/HEAD/source/cmt_system.cxx

@@ -2467 +2467 @@
       if (l_name == "")
         {
+          // the logical name was not set => set it
           l_name = other;
         }
       else
         {
+          // add a new logical name
           cmt_string& n = alternates.add ();
           n = other;
@@ -2492 +2494 @@
 }
 
+//----------------------------------------------------------
+const cmt_string& FilePath::name () const
+{
+  if (l_name != "") return (l_name);
+  else return (p_name);
+}
+
+//----------------------------------------------------------
+FilePath::operator const cmt_string& () const
+{
+  if (l_name != "") return (l_name);
+  else return (p_name);
+}
+
+//----------------------------------------------------------
+bool FilePath::in (const FilePath& other) const
+{
+  const cmt_string& o = other.name ();
+
+  return (in (o));
+
+  return (false);
+}
+
+//----------------------------------------------------------
+bool FilePath::in (const cmt_string& other) const
+{
+  if (p_name.find (other) == 0) return (true);
+  if (l_name.find (other) == 0) return (true);
+
+  for (int i = 0; i < alternates.size (); i++)
+    {
+      const cmt_string& a = alternates[i];
+      if (a.find (other) == 0) return (true);
+    }
+
+  return (false);
+}
+
+//----------------------------------------------------------
+bool FilePath::in (const char* other) const
+{
+  const cmt_string o = other;
+
+  return (in (o));
+}
+
+

CMT/HEAD/source/cmt_system.h

@@ -167 +167 @@
   bool operator != (const char* other) const;
 
+  const cmt_string& name () const;
+  operator const cmt_string& () const;
+
+  bool in (const FilePath& other) const;
+  bool in (const cmt_string& other) const;
+  bool in (const char* other) const;
+
   bool cd () const;