comparison src/grapher.cpp @ 509:6f371814509d

Refactor: sort out changeset structure and parent-child relationships before anything else in grapher. Also stop marking changesets as closed when we reach a change of branch name

 
     DEBUG << "Grapher::layout: Have " << csets.size() << " changesets" << endl;
 
     if (csets.empty()) return;
 
-    // Create (but don't yet position) the changeset items
+    // Initialise changesets hash
 
     foreach (Changeset *cs, csets) {
 
         QString id = cs->id();
 

                   << " in Grapher::layout()" << endl;
             throw LayoutException(QString("Duplicate changeset ID %1").arg(id));
         }
 
         m_changesets[id] = cs;
-
+    }
+    
+    // Set the children for each changeset
+
+    foreach (Changeset *cs, csets) {
+        QString id = cs->id();
+        foreach (QString parentId, cs->parents()) {
+            if (!m_changesets.contains(parentId)) continue;
+            Changeset *parent = m_changesets[parentId];
+            parent->addChild(id);
+        }
+    }
+
+    // Create (but don't yet position) the changeset items
+
+    foreach (Changeset *cs, csets) {
+        QString id = cs->id();
         ChangesetItem *item = new ChangesetItem(cs);
         item->setX(0);
         item->setY(0);
         item->setZValue(0);
         m_items[id] = item;
         m_scene->addChangesetItem(item);
     }
-
-    // Add the connecting lines
-
-    foreach (Changeset *cs, csets) {
-        QString id = cs->id();
-        ChangesetItem *item = m_items[id];
-        bool merge = (cs->parents().size() > 1);
-        foreach (QString parentId, cs->parents()) {
-            if (!m_changesets.contains(parentId)) continue;
-            Changeset *parent = m_changesets[parentId];
-            parent->addChild(id);
-            ConnectionItem *conn = new ConnectionItem();
-            if (merge) conn->setConnectionType(ConnectionItem::Merge);
-            conn->setChild(item);
-            conn->setParent(m_items[parentId]);
-            conn->setZValue(-1);
-            m_scene->addItem(conn);
-        }
-    }
     
     // Ensure the closed branches are all marked as closed
 
     foreach (QString closedId, m_closedIds) {
         
         if (!m_items.contains(closedId)) continue;
         
         Changeset *cs = m_changesets[closedId];
         ChangesetItem *item = m_items[closedId];
 
+        QString branch = cs->branch();
+
         item->setClosingCommit(true);
 
         while (cs && item) {
 
-            if (cs->children().size() > 1) {
+            if (cs->children().size() > 1 || !cs->isOnBranch(branch)) {
                 break;
             }
 
             item->setClosed(true);
 

                 cs = m_changesets[pid];
                 item = m_items[pid];
             } else {
                 item = 0;
             }
+        }
+    }
+
+    // Add the connecting lines
+
+    foreach (Changeset *cs, csets) {
+        QString id = cs->id();
+        ChangesetItem *item = m_items[id];
+        bool merge = (cs->parents().size() > 1);
+        foreach (QString parentId, cs->parents()) {
+            if (!m_changesets.contains(parentId)) continue;
+            ConnectionItem *conn = new ConnectionItem();
+            if (merge) conn->setConnectionType(ConnectionItem::Merge);
+            conn->setChild(item);
+            conn->setParent(m_items[parentId]);
+            conn->setZValue(-1);
+            m_scene->addItem(conn);
         }
     }
 
     // Add uncommitted item and connecting line as necessary