comparison mainwindow.cpp @ 156:4999dbf3a266

* Another simplification to refresh logic, and some textual fixes

     //   paths -> branch -> stat -> heads -> parents -> log
     //
     // Note we want to call enableDisableActions only once, at the end
     // of whichever sequence is in use.
 
+    bool noMore = false;
+
     switch (action) {
         
     case ACT_QUERY_PATHS:
         hgQueryBranch();
         break;

     case ACT_QUERY_PARENTS:
         if (needNewLog) {
             hgLog();
         } else {
             // we're done
-            enableDisableActions();
+            noMore = true;
         }
         break;
 
     case ACT_LOG:
         // we're done
-        enableDisableActions();
+        noMore = true;
 
     default:
         if (shouldHgStat) {
             hgQueryPaths();
         } else {
-            enableDisableActions();
-        }
-        break;
+            noMore = true;
+        }
+        break;
+    }
+
+    if (noMore) {
+        enableDisableActions();
+        hgTabs->updateHistory();
     }
 }
 
 void MainWindow::connectActions()
 {

     //  * our parent is one of those heads
     //
     // A default update makes sense if:
     //  * there is only one parent and
     //  * the parent is not one of the current heads
-    //!!! test this
+
     bool canMerge = false;
     bool canUpdate = false;
+    bool haveMerge = false;
+    int currentBranchHeads = 0;
+
     if (currentParents.size() == 1) {
+        bool parentIsHead = false;
         Changeset *parent = currentParents[0];
-        int currentBranchHeads = 0;
-        bool parentIsHead = false;
         foreach (Changeset *head, currentHeads) {
             DEBUG << "head branch " << head->branch() << ", current branch " << currentBranch << endl;
             if (head->isOnBranch(currentBranch)) {
                 ++currentBranchHeads;
                 if (parent->id() == head->id()) {

             DEBUG << " head ids "<<endl;
             foreach (Changeset *h, currentHeads) {
                 DEBUG << "head id = " << h->id() << endl;
             }
         }
-    }
+    } else {
+        haveMerge = true;
+    }
+        
     hgMergeAct->setEnabled(localRepoActionsEnabled && canMerge);
     hgUpdateAct->setEnabled(localRepoActionsEnabled && canUpdate);
 
     // Set the state field on the file status widget
 

     if (currentBranch == "" || currentBranch == "default") {
         branchText = tr("the default branch");
     } else {
         branchText = tr("branch \"%1\"").arg(currentBranch);
     }
-    if (canUpdate) {
+
+    //!!! Want "merge failed" report
+
+    if (canMerge) {
+        hgTabs->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
+    } else if (haveMerge) {
+        hgTabs->setState(tr("Have merged but not committed on %1").arg(branchText));
+    } else if (canUpdate) {
         hgTabs->setState(tr("On %1. Not at the head of the branch: consider updating").arg(branchText));
-    } else if (canMerge) {
-        hgTabs->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
+    } else if (currentBranchHeads > 1) {
+        hgTabs->setState(tr("At one of %n heads of %1", "", currentBranchHeads).arg(branchText));
     } else {
         hgTabs->setState(tr("At the head of %1").arg(branchText));
     }
-
-    hgTabs->updateHistory();
 }
 
 void MainWindow::createActions()
 {
     //File actions