Changeset 539 for CMT/HEAD/source

Timestamp:

Mar 30, 2010, 4:15:31 PM (14 years ago)

Author:

rybkin

Message:

See C.L. 426

File:

• CMT/HEAD/source/cmt_vcs.cxx (modified) (20 diffs)

CMT/HEAD/source/cmt_vcs.cxx

@@ -227 +227 @@
              const cmt_string& path = "");
 
+  void exclude_current_project ();
+  void restore_current_project ();
+
 private:
   Packages ();
-  void exclude_current_project ();
-  void restore_current_project ();
 
   int m_i;
@@ -653 +654 @@
   */
 
+  /*
   if (version.find ("*") != cmt_string::npos)
     {
@@ -665 +667 @@
   else
     {
+  */
       Use use_obj (package, version, path);
       Use* use = &use_obj;
@@ -677 +680 @@
 //                          module, version,
 //                          m_type);
-    }
+//    }
 
 }
@@ -3686 +3689 @@
   cerr << "   -l          Do not process used packages (default)." << endl;
   cerr << "   -R          Process used products recursively." << endl;
-  cerr << "   -r rev      Check out version tag. (is sticky)" << endl;
+  cerr << "   -r rev      Check out version tag rev (may be HEAD)." << endl;
   cerr << "   -C          Determine version tag and/or package container from context." << endl;
   cerr << "   -i          Do not check out, show package(s) information only." << endl;
@@ -4092 +4095 @@
       }
     } // end of for-loop over checkout.m_modules
-  if (checkout.m_context)
+
+  if (checkout.m_context
+      && !checkout.m_head)
     {
       resolve_uses (checkout, uses + modules.m_uses);
@@ -4154 +4159 @@
 {
 public:
-  VisitorForInfo ()
+  VisitorForInfo (const Vcs::Checkout& checkout)
+    : m_checkout (checkout)
   {
   }
@@ -4160 +4166 @@
   void in (Use* use)
   {
+    cmt_string version (use->version);
+    if (m_checkout.m_head)
+      {
+        version = "HEAD";
+      }
+    else if (version.find ("*") != cmt_string::npos
+             && !m_checkout.m_context)
+      {
+        CmtMessage::warning (use->get_info () +
+                             ": Skipped due to wildcards in version."
+                             " Consider using -C option.");
+        return;
+      }
+
     cmt_string p = use->real_path;
     if (use->path != "")
@@ -4171 +4191 @@
 
     cout << use->get_package_name ()
-         << " " << use->version;
+         << " " << version; //use->version;
     
     if (CmtSystem::absolute_path (use->path))
@@ -4192 +4212 @@
     cout << endl;
   }
+
+private:
+  const Vcs::Checkout& m_checkout;
 };
 
@@ -4209 +4232 @@
   void in (Use* use)
   {
-    cmt_string module ((use->path != "") ? use->path + "/" + use->get_package_name () :
+    cmt_string version (use->version);
+    if (m_checkout.m_head)
+      {
+        version = "HEAD";
+      }
+    else if (version.find ("*") != cmt_string::npos
+             && !m_checkout.m_context)
+      {
+        CmtMessage::warning (use->get_info () +
+                             ": Skipped due to wildcards in version."
+                             " Consider using -C option.");
+        return;
+      }
+
+    cmt_string module ((use->path != "") ?
+                       use->path + "/" + use->get_package_name () :
                        use->get_package_name ());
     Vcs::checkout_module (m_checkout,
@@ -4215 +4253 @@
                           //                      module, version,
                           module,
-                          use->version,
+                          version,
                           m_type);
   }
@@ -4247 +4285 @@
    * Checkout packages found in context
    */
-  if (checkout.m_context)
+  if (checkout.m_context
+      && !checkout.m_head)
     {
       Vcs::checkout_context (checkout, modules,
                              config, with_version_directory,
                              Vcs::Svn);
-      if (!checkout.m_head) return;
+      return;
     }
 
@@ -4258 +4297 @@
    * Call checkout for each command line argument
    */
-  VisitorForInfo visitor_i;
+  VisitorForInfo visitor_i (checkout);
   VisitorForCheckout visitor_co (checkout,
                                  config, with_version_directory,
@@ -4282 +4321 @@
     }
   */
-
-  if (checkout.m_context) return;
 
   /**
@@ -4355 +4392 @@
     {
       CmtMessage::info (module + " done.");
-      if (checkout.m_recursive && !checkout.m_context)
+      if (checkout.m_recursive
+          && (!checkout.m_context || checkout.m_head))
+        //      if (checkout.m_recursive && !checkout.m_context)
         //      if (checkout.m_recursive)
         {
@@ -4517 +4556 @@
                             Vcs::VcsType type)
 {
-  VisitorForInfo visitor_i;
+  VisitorForInfo visitor_i (checkout);
   VisitorForCheckout visitor_co (checkout,
                                  config, with_version_directory,
@@ -4658 +4697 @@
   //int Vcs::resolve_uses (const Checkout& checkout, const Modules& modules)
 {
-  if (!checkout.m_context) return 0;
+  Packages& pkgs = Packages::instance ();
+  pkgs.exclude_current_project ();
+
+  bool cur_recursive (Cmt::get_recursive ());
+  CmtScopeFilteringMode
+    cur_scope_filtering_mode (Cmt::get_scope_filtering_mode ());
+
+  if (checkout.m_recursive)
+    {
+      Cmt::set_recursive (true);
+      Cmt::set_scope_filtering_mode (reach_private_uses);
+    }
+
+  SyntaxParser::parse_requirements_text (uses, "", &(Use::current()));
+
+  if (checkout.m_recursive)
+    {
+      Cmt::set_recursive (cur_recursive);
+      Cmt::set_scope_filtering_mode (cur_scope_filtering_mode);
+    }
+
+  pkgs.restore_current_project ();
+
+  if (CmtError::get_last_error_code () == CmtError::package_not_found)
+    {
+      CmtError::print ();
+      return -1;
+    }
+
+  return 0;
+}
+/*
+int Vcs::resolve_uses (const Checkout& checkout, const cmt_string& uses)
+  //int Vcs::resolve_uses (const Checkout& checkout, const Modules& modules)
+{
+  //  if (!checkout.m_context) return 0;
 
   //  cerr << "Vcs::resolve_uses NEW+" << endl;
@@ -4760 +4834 @@
   return 0;
 }
-
+*/
 //--------------------------------------------------------------------
 void Vcs::checkout_from_requirements (const Vcs::Checkout& checkout,
@@ -4780 +4854 @@
   if (checkout.m_info)
     {
-      VisitorForInfo visitor_i;
+      VisitorForInfo visitor_i (checkout);
       Walkthru wth (visitor_i);
       wth.run (text, expression);