comparison grapher.cpp @ 74:10eb97683aa9

* Show branch names even for changes with children, if those children are on a different branch
* Pick up remote repo path from local repo via hg paths
* Some work towards breaking down files into various groups based on status
* Add /usr/local/bin to path for hg (temporary hack I hope)

         item->setY(0);
 	m_items[id] = item;
         m_scene->addItem(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()) {

 	    conn->setParent(m_items[parentId]);
 	    m_scene->addItem(conn);
 	}
     }
 
+    // Add the branch labels
+    foreach (Changeset *cs, csets) {
+        QString id = cs->id();
+        ChangesetItem *item = m_items[id];
+        bool haveChildOnSameBranch = false;
+        foreach (QString childId, cs->children()) {
+            Changeset *child = m_changesets[childId];
+            if (child->branch() == cs->branch()) {
+                haveChildOnSameBranch = true;
+                break;
+            }
+        }
+        item->setShowBranch(!haveChildOnSameBranch);
+    }
+
     // We need to lay out the changesets in forward chronological
     // order.  We have no guarantees about the order in which
     // changesets appear in the list -- in a simple repository they
     // will generally be reverse chronological, but that's far from
     // guaranteed.  So, sort explicitly using the date comparator