changeset 227:5d8a5ce96163

Merge

--- a/filestatuswidget.cpp	Thu Jan 06 11:48:56 2011 +0000
+++ b/filestatuswidget.cpp	Thu Jan 06 12:07:06 2011 +0000
@@ -97,8 +97,8 @@
 
     m_descriptions[FileStates::Clean] = tr("You have not changed these files.");
     m_descriptions[FileStates::Modified] = tr("You have changed these files since you last committed them.");
-    m_descriptions[FileStates::Added] = tr("These files will be added to version control next time you commit.");
-    m_descriptions[FileStates::Removed] = tr("These files will be removed from version control next time you commit.<br>"
+    m_descriptions[FileStates::Added] = tr("These files will be added to version control next time you commit them.");
+    m_descriptions[FileStates::Removed] = tr("These files will be removed from version control next time you commit them.<br>"
                                              "They will not be deleted from the local folder.");
     m_descriptions[FileStates::Missing] = tr("These files are recorded in the version control, but absent from your working folder.<br>"
                                              "If you intended to delete them, select them and use Remove to tell the version control system about it.<br>"

--- a/mainwindow.cpp	Thu Jan 06 11:48:56 2011 +0000
+++ b/mainwindow.cpp	Thu Jan 06 12:07:06 2011 +0000
@@ -155,9 +155,6 @@
 {
    QMessageBox::about(this, tr("About EasyMercurial"),
                       tr("<qt><h2>About EasyMercurial</h2>"
-#ifdef Q_OS_MAC
-                         "<font size=-1>"
-#endif
                          "<p>EasyMercurial is a simple user interface for the "
                          "Mercurial</a> version control system.</p>"
                          "<h4>Credits and Copyright</h4>"
@@ -185,10 +182,7 @@
                          "published by the Free Software Foundation; either version 2 of the "
                          "License, or (at your option) any later version.  See the file "
                          "COPYING included with this distribution for more information.</p>"
-#ifdef Q_OS_MAC
-                         "</font>"
-#endif
-                         ));
+                          ));
 }
 
 void MainWindow::clearSelections()
@@ -2030,6 +2024,7 @@
     bool canUpdate = false;
     bool haveMerge = false;
     bool emptyRepo = false;
+    bool noWorkingCopy = false;
     int currentBranchHeads = 0;
 
     if (currentParents.size() == 1) {
@@ -2056,7 +2051,16 @@
             }
         }
     } else if (currentParents.size() == 0) {
-        emptyRepo = true;
+        if (currentHeads.size() == 0) {
+            // No heads -> empty repo
+            emptyRepo = true;
+        } else {
+            // Heads, but no parents -> no working copy, e.g. we have
+            // just converted this repo but haven't updated in it yet.
+            // Uncommon but confusing; probably merits a special case
+            noWorkingCopy = true;
+            canUpdate = true;
+        }
     } else {
         haveMerge = true;
         justMerged = true;
@@ -2080,6 +2084,8 @@
         hgTabs->setState(tr("(Examining repository)"));
     } else if (emptyRepo) {
         hgTabs->setState(tr("Nothing committed to this repository yet"));
+    } else if (noWorkingCopy) {
+        hgTabs->setState(tr("No working copy yet: consider updating"));
     } else if (canMerge) {
         hgTabs->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
     } else if (!hgTabs->getAllUnresolvedFiles().empty()) {

--- a/version.h	Thu Jan 06 11:48:56 2011 +0000
+++ b/version.h	Thu Jan 06 12:07:06 2011 +0000
@@ -1,1 +1,1 @@
-#define EASYHG_VERSION                      "0.8"
+#define EASYHG_VERSION "0.1"