diff mainwindow.cpp @ 129:4986642800f0

* Initial work on showing uncommitted changes (as dashed box) in history graph
author Chris Cannam
date Mon, 29 Nov 2010 20:53:34 +0000
parents fcaf09ee825d
children 9ae4cc0055e8
line wrap: on
line diff
--- a/mainwindow.cpp	Mon Nov 29 20:09:58 2010 +0000
+++ b/mainwindow.cpp	Mon Nov 29 20:53:34 2010 +0000
@@ -1246,13 +1246,8 @@
         break;
         
     case ACT_QUERY_PARENTS:
-    {
         foreach (Changeset *cs, currentParents) delete cs;
         currentParents = Changeset::parseChangesets(output);
-        QStringList ids;
-        foreach (Changeset *cs, currentParents) ids.push_back(cs->id());
-        hgTabs->setCurrent(ids);
-    }
         break;
         
     case ACT_QUERY_HEADS:
@@ -1507,6 +1502,11 @@
     hgMergeAct->setEnabled(localRepoActionsEnabled && canMerge);
     hgUpdateAct->setEnabled(localRepoActionsEnabled && canUpdate);
 
+    QStringList ids;
+    foreach (Changeset *cs, currentParents) ids.push_back(cs->id());
+    hgTabs->setCurrent(ids);
+    hgTabs->showUncommittedChanges(hgTabs->canCommit());
+
     // Set the state field on the file status widget
 
     QString branchText;