Changeset 535 for CMT/HEAD/source/cmt_project.cxx

Timestamp:

Mar 26, 2010, 11:56:50 AM (14 years ago)

Author:

rybkin

Message:

See C.L. 422

File:

• CMT/HEAD/source/cmt_project.cxx (modified) (39 diffs)

CMT/HEAD/source/cmt_project.cxx

@@ -247 +247 @@
             }
   
+          bool updated (false);
           if (parent != 0)
             {
+              if (!p.has_parent (parent) || !parent->has_child (&p))
+                {
               p.add_parent (parent);
               parent->add_child (&p);
@@ -255 +258 @@
 
               parent->update_strategies_from_children ();
+              updated = true;
+                }
+
             }
 
           CmtSystem::cd (here);
+          if (updated) Project::order_all ();
           return (&p);
         }
@@ -278 +285 @@
 
   // In case there are symlinks
-  cmt_string here_real, pwd_real;
+
+  //  cmt_string here_real, pwd_real;
   //cerr << "realpath_: create_project" << endl;
+  /*
   if (CmtSystem::realpath_ (here, here_real) && CmtSystem::realpath_ (pwd, pwd_real))
     {
       if (here_real.find (pwd_real) == 0) is_current = true;
+    }
+  */
+  cmt_string pwd_real;
+  if (CmtSystem::realpath_ (pwd, pwd_real))
+    {
+      if (Cmt::get_current_dir_real ().find (pwd_real) == 0) is_current = true;
     }
 
@@ -544 +559 @@
       parent->update_strategies_from_children ();
     }
+  /*
   else if ((name != "CMTUSERCONTEXT") && (name != "CMTHOME"))
     //  else
@@ -569 +585 @@
       project->update_strategies_from_children ();
     }
-
+  */
   if (source == "default path")
     {
@@ -581 +597 @@
   project->set_cmtpath_source (source);
 
+  project->set_is_current (is_current);
+
   if (is_current)
     {
+      //      cerr << "current: " << project->get_name () << endl;
       //
       // The current project defines a tag with its name
@@ -594 +613 @@
 
 
+  //  Project::order_all ();
 
   if (text != "")
@@ -649 +669 @@
 
   CmtSystem::cd (here);
+  Project::order_all ();
 
   return (project);
@@ -820 +841 @@
 Project* Project::get_current ()
 {
+  /*
   cmt_string here = CmtSystem::pwd ();
 
@@ -825 +847 @@
   cmt_string here_real;
   CmtSystem::realpath_ (here, here_real);
-
+  */
   static ProjectVector& Projects = projects ();
 
@@ -840 +862 @@
 
 //      if (here.find (p.m_cmtpath) == 0) 
-      if (here_real.find (p.m_cmtpath_real) == 0) 
+      if (p.is_current ()) 
+        //      if (here_real.find (p.m_cmtpath_real) == 0) 
         {
           result = &p;
@@ -907 +930 @@
 
 //----------------------------------------------------------
-Project::ProjectPtrVector Project::ordered_projects ()
-{
-  static ProjectPtrVector OrderedProjects;
+Project::ProjectPtrVector& Project::ordered_projects ()
+{
+  static Database& db = Database::instance ();
+  static ProjectPtrVector& Projects = db.ordered_projects ();
+
+  return (Projects);
+}
+
+//----------------------------------------------------------
+void Project::order_all ()
+//Project::ProjectPtrVector Project::ordered_projects ()
+{
+  ProjectPtrVector OrderedProjects;
+  //  static ProjectPtrVector OrderedProjects;
+  static Project::ProjectPtrVector& orderedProjects = Project::ordered_projects ();
 
   static Project::ProjectVector& Projects = Project::projects ();
@@ -956 +991 @@
           OrderedProjects[i] = p;
         }
+      /*
       if (2 == offset)
         {
@@ -962 +998 @@
           OrderedProjects[0]->update_strategies_from_children ();
         }
-      return OrderedProjects;
+      */
+      for (int i = OrderedProjects.size () - 2; i >= 0; i--)
+        {
+          if (!OrderedProjects[i]->has_parents () &&
+              OrderedProjects[i]->get_children_size () == 0)
+            {
+              OrderedProjects[i]->add_child (OrderedProjects[i + 1]);
+              OrderedProjects[i]->update_strategies_from_children ();
+              OrderedProjects[i]->erase_child (OrderedProjects[i + 1]);
+            }
+        }
+
+      orderedProjects = OrderedProjects;
+      //      return OrderedProjects;
+      return;
     }
 
@@ -968 +1018 @@
 
   //  cerr << "get_current: " << p << " offset: " << offset << endl;
+  /*
   if (p == 0)
     {
@@ -973 +1024 @@
       //      p = &(Projects[0]);
     }
+  */
   //  cerr << "p: " << p << " offset: " << offset << " name: " << p->get_name () << endl;
 
   int order (-1);
-
+  /*
   if ((p->get_name () != "CMTUSERCONTEXT") && (p->get_name () != "CMTHOME"))
     {
@@ -989 +1041 @@
   //  cerr << "order: " << order << endl;
   //  int unordered = size - offset - (order + 1);
+  */
+  ProjectPtrVector projs;
+
+  if (p != 0 && (p->get_name () != "CMTUSERCONTEXT") && (p->get_name () != "CMTHOME"))
+    {
+      p->m_order = ++order;
+      projs.push_back (p);
+    }
+
+  if (p == 0 ||
+      (!p->has_parents () && p->get_children_size () == 0)
+      // comes from CMTPATH entry
+      )
+    {
+      for (int i = offset; i < size; i++)
+        {
+          Project* q = &(Projects[i]);
+          if (q != p && !q->has_parents ())
+            {
+              q->m_order = ++order;
+              projs.push_back (q);
+            }
+        }
+    }
+
+  visit (offset, order, projs);
 
   int beg (0);
@@ -1017 +1095 @@
           */
         }
+      else if (-2 != j)
+        {
+          OrderedProjects[beg + j] = p;
+        }
+      /*
       else if  (-2 == j)
         {
@@ -1026 +1109 @@
           //      cerr << "OrderedProjects[" << beg + j << "]: " << (OrderedProjects[beg + j])->get_name () << endl;
         }
-    }
-
+      */
+    }
+
+  if (p != 0)
+    {
+      for (int i = 0; i < noorder; i++)
+        OrderedProjects.pop_back ();
+    }
   if  (-1 != ihome)
     {
-      OrderedProjects[size - 1] = &(Projects[ihome]);
-    }
-
+      OrderedProjects[OrderedProjects.size () - 1] = &(Projects[ihome]);
+    }
+  /*
+  if (p)
+    {
+      if  (-1 != ihome)
+        {
+          OrderedProjects[beg + order + 1] = &(Projects[ihome]);
+        }
+      for (int i = 0; i < noorder; i++)
+        OrderedProjects.pop_back ();
+    }
+  else
+    {
+      if  (-1 != ihome)
+        {
+          OrderedProjects[size - 1] = &(Projects[ihome]);
+        }
+    }
+  */
+      /*
   if  (-1 != iuser)
     {
@@ -1039 +1146 @@
       OrderedProjects[0]->update_strategies_from_children ();
     }
-
-  if  (-1 != ihome)
-    {
+      */
+
+//   if  (-1 != ihome)
+//     {
       /*
       cerr << "beg: " << beg << " order: " << order << endl;
       cerr << "noorder: " << noorder << " size - offset: " << size - offset << endl;
       */
+      /*
       if (noorder != size - offset)
         {  // the last ordered project
@@ -1058 +1167 @@
           OrderedProjects[size - 2]->update_strategies_from_children ();
         }
-    }
-
-  return OrderedProjects;
+      */
+//     }
+
+  for (int i = OrderedProjects.size () - 2; i >= 0; i--)
+    {
+      if (!OrderedProjects[i]->has_parents () &&
+          OrderedProjects[i]->get_children_size () == 0)
+        {
+          OrderedProjects[i]->add_child (OrderedProjects[i + 1]);
+          OrderedProjects[i]->update_strategies_from_children ();
+          OrderedProjects[i]->erase_child (OrderedProjects[i + 1]);
+        }
+    }
+
+  orderedProjects = OrderedProjects;
+  //  return OrderedProjects;
+  return;
 }
 
@@ -1080 +1203 @@
 void Project::show_all ()
 {
-  const Project::ProjectPtrVector& Ordered = Project::ordered_projects ();
-  //  static const Project::ProjectPtrVector Ordered = Project::ordered_projects ();
-  
-  for (int i = 0; i < Ordered.size (); i++)
-    {
-      Project* p = Ordered[i];
-      p->m_visited = false;
-    }
-
-  Project* p = get_current ();
-
-  if (p == 0)
-    {
-      if (Ordered.size () == 0) return;
-
-      p = Ordered[0];
-    }
-  /*
+  static const Project::ProjectPtrVector& Ordered = Project::ordered_projects ();
   static Project::ProjectVector& Projects = Project::projects ();
   
@@ -1106 +1212 @@
     }
 
+  for (int i = 0; i < Ordered.size (); i++)
+    Ordered[i]->show ();
+
+  for (int i = 0; i < Projects.size (); i++)
+    Projects[i].show ();
+
+  /*
   Project* p = get_current ();
 
   if (p == 0)
     {
-      if (Projects.size () == 0) return;
-
-      p = &(Projects[0]);
+      if (Ordered.size () == 0) return;
+
+      p = Ordered[0];
     }
   */
-
-  p->show ();
+  //  p->show ();
 }
 
@@ -1303 +1415 @@
 void Project::fill_selection (int depth, CmtSystem::cmt_string_vector& path_selections)
 {
-  static ProjectPtrVector Ordered = Project::ordered_projects ();
+  static ProjectPtrVector& Ordered = Project::ordered_projects ();
   for (int i = 0; i < Ordered.size (); i++)
     {
@@ -1352 +1464 @@
 void Project::broadcast (IProjectAction& action)
 {
-  static ProjectPtrVector Projects = Project::ordered_projects ();
+  //  const ProjectPtrVector Projects = Project::ordered_projects ();
+  static ProjectPtrVector& Projects = Project::ordered_projects ();
 
   for (int i = 0; i < Projects.size (); i++)
@@ -1375 +1488 @@
 void Project::reverse_broadcast (IProjectAction& action)
 {
-  static ProjectPtrVector Projects = Project::ordered_projects ();
+  //  const ProjectPtrVector Projects = Project::ordered_projects ();
+  static ProjectPtrVector& Projects = Project::ordered_projects ();
 
   for (int i = (Projects.size () - 1); i >= 0; i--)
@@ -1556 +1670 @@
 {
   int size = projs.size ();
+  //  cerr << "visit: " << offset << " " << order << " " << size << endl;
   if (0 == size) return;
   static ProjectVector& all = Project::projects ();
@@ -1591 +1706 @@
               child->m_order = ++order;
             }
-          else if (0 == chorder)
+          else if (child->is_current ())
+            //    else if (0 == chorder)
             { // the project we started with, i. e. the current project:
               //     o circular dependency
@@ -1601 +1717 @@
                                      + " " + child->get_cmtpath ());
             }
-          else if ((0 < chorder) && (chorder < porder))
+          else if ((0 <= chorder) && (chorder < porder))
+            //    else if ((0 < chorder) && (chorder < porder))
             { // ordered already, want to put it after the parent in the order
               for (int k = offset; k < all.size (); k++)
@@ -1609 +1726 @@
                     {// the child we are putting after the parent in the order
                       q.m_order = porder;
-                      //     cerr << "Moved back: " << q.get_name () << " order: " << q.m_order << endl;
+                      //              cerr << "Moved back: " << q.get_name () << " order: " << q.m_order << endl;
                     }
                   else if ((chorder < q.m_order) && (q.m_order <= porder))
@@ -1615 +1732 @@
                 }
             }
-          //      cerr << child->get_name () << " out: " << child->m_order << endl;
+          //  cerr << child->get_name () << " out: " << child->m_order << endl;
           //      child->m_visits++;
           bool unknown (true);
@@ -1748 +1865 @@
   start_visit (visitor);
   */
-  const ProjectPtrVector Ordered = Project::ordered_projects ();
+  const ProjectPtrVector& Ordered = Project::ordered_projects ();
 
   buffer = "path CMTPATH \"\" \n";
@@ -1909 +2026 @@
 
 //----------------------------------------------------------
+void Project::set_is_current (bool is_current)
+{
+  m_is_current = is_current;
+}
+
+//----------------------------------------------------------
+bool Project::is_current () const
+{
+  return m_is_current;
+}
+
+//----------------------------------------------------------
 void Project::clear ()
 {
@@ -1925 +2054 @@
 
   m_strategies.clear ();
+  m_is_current = false;
 }
 
@@ -2019 +2149 @@
 
   m_children.push_back (p);
+}
+
+//----------------------------------------------------------
+void Project::erase_child (Project* p)
+{
+  if (p == 0) return;
+  if (p == this) return;
+
+  if (!has_child (p)) return;
+
+  const cmt_string& name = p->get_name ();
+
+  for (int i = 0; i < m_children.size (); i++)
+    {
+      const Project* child = m_children[i];
+      if (child == 0) continue;
+
+      if (child->get_name () == name)
+        {
+          // registered as a child
+          m_children.erase (i);
+          break;
+        }
+    }
 }
 
@@ -2088 +2242 @@
       use->set (name, version, path);
       use->get_package ()->remove_use (use);
+      CmtSystem::cd (m_cmtpath_pwd);
       if (use->move_to ())
         {
@@ -2103 +2258 @@
             {
               use->~Use ();
+            }
+          else if (!CmtSystem::absolute_path (use->real_path))
+            {
+              use->change_path (m_cmtpath_pwd);
             }
         }
@@ -2382 +2541 @@
   static int level = 0;
 
-  bool is_current = false;
+  //  bool is_current = false;
 
   //  cmt_string here = CmtSystem::pwd ();
   // In case there are symlinks
+  /*
   cmt_string here_real;
   CmtSystem::realpath_ (CmtSystem::pwd (), here_real);
@@ -2397 +2557 @@
         }
     }
-
+  */
   for (int tab = 0; tab < level; tab++) cout << "  ";
   cout << m_name << " " << (m_name != "CMTUSERCONTEXT" && m_name != "CMTHOME" ? m_release : "v0") << " (in " << m_cmtpath << ")";
   //  cout << m_name << " " << m_release << " (in " << m_cmtpath << ")";
 
-  if (is_current) cout << " (current)";
+  if (m_is_current) cout << " (current)";
+  //  if (is_current) cout << " (current)";
 
   int i;