comparison historywidget.cpp @ 122:c3e8342d2de9

* Further fix to incremental log (put new changesets on the correct end of the list!)

 }
     
 void HistoryWidget::parseNewLog(QString log)
 {
     DEBUG << "HistoryWidget::parseNewLog: log has " << log.length() << " chars" << endl;
-    Changesets csets = parseChangeSets(log);
+    Changesets csets = Changeset::parseChangesets(log);
     DEBUG << "HistoryWidget::parseNewLog: log has " << csets.size() << " changesets" << endl;
     clearChangesets();
     m_changesets = csets;
     layoutAll();
 }
     
 void HistoryWidget::parseIncrementalLog(QString log)
 {
     DEBUG << "HistoryWidget::parseIncrementalLog: log has " << log.length() << " chars" << endl;
-    Changesets csets = parseChangeSets(log);
+    Changesets csets = Changeset::parseChangesets(log);
     DEBUG << "HistoryWidget::parseIncrementalLog: log has " << csets.size() << " changesets" << endl;
     if (!csets.empty()) {
-        m_changesets << csets;
+        csets << m_changesets;
+        m_changesets = csets;
         layoutAll();
     }
 }
 
 void HistoryWidget::layoutAll()
 {
+    setChangesetParents();
+
     ChangesetScene *scene = new ChangesetScene();
     ChangesetItem *tipItem = 0;
 
     if (!m_changesets.empty()) {
 	Grapher g(scene);

 
     if (oldScene) delete oldScene;
     if (tipItem) tipItem->ensureVisible();
 }
 
-Changesets HistoryWidget::parseChangeSets(QString changeSetsStr)
+void HistoryWidget::setChangesetParents()
 {
-    Changesets csets = Changeset::parseChangesets(changeSetsStr);
-    for (int i = 0; i+1 < csets.size(); ++i) {
-        Changeset *cs = csets[i];
+    for (int i = 0; i+1 < m_changesets.size(); ++i) {
+        Changeset *cs = m_changesets[i];
         if (cs->parents().empty()) {
             QStringList list;
-            list.push_back(csets[i+1]->id());
+            list.push_back(m_changesets[i+1]->id());
             cs->setParents(list);
         }
     }
-    return csets;
 }