comparison grapher.cpp @ 139:e8a481789607

* Avoid unnecessary duplicate layout; fix off-by-one in resetting changeset children

     // look for merging children and children distant from us but in a
     // straight line, and make sure nobody is going to overwrite their
     // connection lines
 
     foreach (QString childId, cs->children()) {
+        DEBUG << "reserving connection line space" << endl;
         if (!m_changesets.contains(childId)) continue;
         Changeset *child = m_changesets[childId];
         int childRow = m_items[childId]->row();
         if (child->parents().size() > 1 ||
             child->branch() == cs->branch()) {

 
     // look for the case where exactly two children have the same
     // branch as us: split them to a little either side of our position
 
     if (nchildren > 1) {
-
         QList<QString> special;
         foreach (QString childId, cs->children()) {
             if (!m_changesets.contains(childId)) continue;
             Changeset *child = m_changesets[childId];
             if (child->branch() == branch &&
                 child->parents().size() == 1) {
                 special.push_back(childId);
             }
         }
         if (special.size() == 2) {
+            DEBUG << "handling split-in-two for children " << special[0] << " and " << special[1] << endl;
             for (int i = 0; i < 2; ++i) {
                 int off = i * 2 - 1; // 0 -> -1, 1 -> 1
                 ChangesetItem *it = m_items[special[i]];
                 it->setColumn(findAvailableColumn(it->row(), col + off, true));
                 for (int r = row-1; r >= it->row(); --r) {

     m_changesets.clear();
     m_items.clear();
     m_alloc.clear();
     m_branchHomes.clear();
 
+    DEBUG << "Grapher::layout: Have " << csets.size() << " changesets" << endl;
+
     if (csets.empty()) return;
 
     foreach (Changeset *cs, csets) {
 
         QString id = cs->id();
-        DEBUG << id.toStdString() << endl;
+//        DEBUG << id.toStdString() << endl;
 
         if (id == "") {
             throw LayoutException("Changeset has no ID");
         }
         if (m_changesets.contains(id)) {