comparison mainwindow.cpp @ 235:2f4d401ce47c

* Better handling for case where we've just created a new branch but not yet committed it (i.e. no heads are on our current branch)

     bool canMerge = false;
     bool canUpdate = false;
     bool haveMerge = false;
     bool emptyRepo = false;
     bool noWorkingCopy = false;
+    bool newBranch = false;
     int currentBranchHeads = 0;
 
     if (currentParents.size() == 1) {
         bool parentIsHead = false;
         Changeset *parent = currentParents[0];
         foreach (Changeset *head, currentHeads) {
             DEBUG << "head branch " << head->branch() << ", current branch " << currentBranch << endl;
             if (head->isOnBranch(currentBranch)) {
                 ++currentBranchHeads;
-                if (parent->id() == head->id()) {
-                    parentIsHead = true;
-                }
+            }
+            if (parent->id() == head->id()) {
+                parentIsHead = true;
             }
         }
         if (currentBranchHeads == 2 && parentIsHead) {
             canMerge = true;
+        }
+        if (currentBranchHeads == 0 && parentIsHead) {
+            // Just created a new branch
+            newBranch = true;
         }
         if (!parentIsHead) {
             canUpdate = true;
             DEBUG << "parent id = " << parent->id() << endl;
             DEBUG << " head ids "<<endl;

         hgTabs->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
     } else if (!hgTabs->getAllUnresolvedFiles().empty()) {
         hgTabs->setState(tr("Have unresolved files following merge on %1").arg(branchText));
     } else if (haveMerge) {
         hgTabs->setState(tr("Have merged but not yet committed on %1").arg(branchText));
+    } else if (newBranch) {
+        hgTabs->setState(tr("On %1.  New branch: has not yet been committed").arg(branchText));
     } else if (canUpdate) {
         if (hgTabs->haveChangesToCommit()) {
             // have uncommitted changes
             hgTabs->setState(tr("On %1. Not at the head of the branch").arg(branchText));
         } else {