comparison src/grapher.cpp @ 691:5b3bcb2d0943

Update handling of auth extension load failures on Windows: hg itself is returning a successful error code, so we must check the output in the extension test phase. Also fix a failure & crash when trying to use fallback auth mechanism

 
 #include <QSettings>
 
 #include <iostream>
 
+//#define GRAPHER_VERBOSE_DEBUG 1
+
 Grapher::Grapher(ChangesetScene *scene) :
     m_scene(scene)
 {
     QSettings settings;
     settings.beginGroup("Presentation");

     if (!m_items.contains(id)) {
         return;
     }
     Changeset *cs = m_changesets[id];
     ChangesetItem *item = m_items[id];
+#ifdef GRAPHER_VERBOSE_DEBUG
     DEBUG << "layoutRow: Looking at " << id.toStdString() << endl;
+#endif
 
     int row = 0;
     int nparents = cs->parents().size();
 
     if (nparents > 0) {

     // row (we need it later, to avoid overwriting the connecting line)
     if (!m_uncommittedParents.empty() && m_uncommittedParents[0] == id) {
         m_uncommittedParentRow = row;
     }
 
+#ifdef GRAPHER_VERBOSE_DEBUG
     DEBUG << "putting " << cs->id().toStdString() << " at row " << row 
           << endl;
-
+#endif
+    
     item->setRow(row);
     m_handled.insert(id);
 }
 
 void Grapher::layoutCol(QString id)
 {
     if (m_handled.contains(id)) {
+#ifdef GRAPHER_VERBOSE_DEBUG
         DEBUG << "Already looked at " << id.toStdString() << endl;
+#endif
         return;
     }
     if (!m_changesets.contains(id)) {
         throw LayoutException(QString("Changeset %1 not in ID map").arg(id));
     }
     if (!m_items.contains(id)) {
         return;
     }
 
     Changeset *cs = m_changesets[id];
+#ifdef GRAPHER_VERBOSE_DEBUG
     DEBUG << "layoutCol: Looking at " << id.toStdString() << endl;
+#endif
 
     ChangesetItem *item = m_items[id];
 
     int col = 0;
     int row = item->row();

             col = findAvailableColumn(item->row(), col, false);
         }
         break;
     }
 
+#ifdef GRAPHER_VERBOSE_DEBUG
     DEBUG << "putting " << cs->id().toStdString() << " at col " << col << endl;
-
+#endif
+    
     m_alloc[row].insert(col);
     item->setColumn(col);
     m_handled.insert(id);
 
     // If we're the first parent of the uncommitted item, it should be

     // 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()) {
+#ifdef GRAPHER_VERBOSE_DEBUG
         DEBUG << "reserving connection line space" << endl;
+#endif
         if (!m_items.contains(childId)) continue;
         Changeset *child = m_changesets[childId];
         int childRow = m_items[childId]->row();
         if (child->parents().size() > 1 ||
             child->isOnBranch(cs->branch())) {

                 child->parents().size() == 1) {
                 special.push_back(childId);
             }
         }
         if (special.size() == 2) {
+#ifdef GRAPHER_VERBOSE_DEBUG
             DEBUG << "handling split-in-two for children " << special[0] << " and " << special[1] << endl;
+#endif
             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_branchHomes[branch] = home;
     }
 
+#ifdef GRAPHER_VERBOSE_DEBUG
     foreach (QString branch, m_branchRanges.keys()) {
         DEBUG << branch.toStdString() << ": " << m_branchRanges[branch].first << " - " << m_branchRanges[branch].second << ", home " << m_branchHomes[branch] << endl;
     }
+#endif
 }
 
 static bool
 compareChangesetsByDate(Changeset *const &a, Changeset *const &b)
 {

     // guaranteed.  So, sort explicitly using the date comparator
     // above
 
     qStableSort(csets.begin(), csets.end(), compareChangesetsByDate);
 
+#ifdef GRAPHER_VERBOSE_DEBUG
     foreach (Changeset *cs, csets) {
         DEBUG << "id " << cs->id().toStdString() << ", ts " << cs->timestamp()
               << ", date " << cs->datetime().toStdString() << endl;
     }
+#endif
 
     m_handled.clear();
     foreach (Changeset *cs, csets) {
         layoutRow(cs->id());
     }

     // We've given the uncommitted item a column, but not a row yet --
     // it always goes at the top
 
     if (m_uncommitted) {
         --minrow;
+#ifdef GRAPHER_VERBOSE_DEBUG
         DEBUG << "putting uncommitted item at row " << minrow << endl;
+#endif
         m_uncommitted->setRow(minrow);
     }
 
     // Changeset items that have nothing to either side of them can be
     // made double-width