Mercurial > hg > easyhg

changeset 640:91b7ad45c608

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Fri, 19 Oct 2012 11:47:28 +0100
parents 31f5168fb5d9 (current diff) 66adbedb69a9 (diff)
children b29b9694cd0d
files src/mainwindow.cpp
diffstat 2 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/historywidget.cpp	Fri Oct 19 11:41:38 2012 +0100
+++ b/src/historywidget.cpp	Fri Oct 19 11:47:28 2012 +0100
@@ -243,11 +243,24 @@
         toFocus = g.getUncommittedItem();
         if (!toFocus) {
             if (!m_currentIds.empty()) {
-                toFocus = g.getItemFor(m_currentIds[0]);
+                for (int i = 0; i < m_currentIds.size(); ++i) {
+                    toFocus = g.getItemFor(m_currentIds[i]);
+                    if (toFocus != 0) {
+                        break;
+                    }
+                }
             } else {
                 toFocus = g.getItemFor(m_changesets[0]);
             }
         }
+        if (!toFocus) {
+            for (int i = 0; i < m_changesets.size(); ++i) {
+                toFocus = g.getItemFor(m_changesets[i]);
+                if (toFocus != 0) {
+                    break;
+                }
+            }
+        }
     }
 
     m_panned->setScene(scene);
--- a/src/mainwindow.cpp	Fri Oct 19 11:41:38 2012 +0100
+++ b/src/mainwindow.cpp	Fri Oct 19 11:47:28 2012 +0100
@@ -3195,7 +3195,7 @@
     QString tag = QString("version-%1-available-show").arg(version);
     if (settings.value(tag, true).toBool()) {
         QString title(tr("Newer version available"));
-        QString text(tr("<h3>Newer version available</h3><p>You are using version %1 of EasyMercurial, but version %3 is now available.</p><p>Please see the <a href=\"http://easymercurial.org/\">EasyMercurial website</a> for more information.</p>").arg(EASYHG_VERSION).arg(version));
+        QString text(tr("<h3>Newer version available</h3><p>You are using version %1 of EasyMercurial, but version %3 is now available.</p><p>Please see the <a href=\"http://easyhg.org/\">EasyMercurial website</a> for more information.</p>").arg(EASYHG_VERSION).arg(version));
         QMessageBox::information(this, title, text);
         settings.setValue(tag, false);
     }