Mercurial > hg > easyhg

changeset 294:fc9d411ff6e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some breakages from prior merge commit (oops); make merge result use more-information dialog
author Chris Cannam
date Mon, 21 Feb 2011 18:20:29 +0000
parents 7b4f42cfc596
children 01a471e9cbe3
files mainwindow.cpp
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mainwindow.cpp	Mon Feb 21 18:17:18 2011 +0000
+++ b/mainwindow.cpp	Mon Feb 21 18:20:29 2011 +0000
@@ -1599,7 +1599,7 @@
     } else if (n == 0) {
         head = tr("No changes to push");
         report = tr("The remote repository already contains all changes that have been committed locally.");
-        if (hgTabs->canCommit()) {
+        if (m_hgTabs->canCommit()) {
             report = tr("%1<p>You do have some uncommitted changes. If you wish to push those to the remote repository, commit them locally first.").arg(report);
         }            
     } else {
@@ -1627,8 +1627,6 @@
     }
     m_runner->hide();
 
-    runner->hide();
-
     MoreInformationDialog::information(this, tr("Pull complete"),
                                        head, report, output);
 }
@@ -1877,7 +1875,7 @@
             (this,
              tr("Clone"),
              tr("Clone successful"),
-             tr("The remote repository <pre>%1</pre> was successfully cloned to the local folder <pre>%2</pre>.").arg(remoteRepoPath).arg(workFolderPath),
+             tr("The remote repository <pre>%1</pre> was successfully cloned to the local folder <pre>%2</pre>.").arg(m_remoteRepoPath).arg(m_workFolderPath),
              output);
         enableDisableActions();
         m_shouldHgStat = true;
@@ -1986,8 +1984,10 @@
         break;
         
     case ACT_MERGE:
-        //!!! use format3?
-        QMessageBox::information(this, tr("Merge"), tr("<qt><h3>Merge successful</h3><pre>%1</pre>").arg(xmlEncode(output)));
+        MoreInformationDialog::information
+            (this, tr("Merge"), tr("Merge successful"),
+             tr("The merge succeeded.  Remember to commit the result!"),
+             output);
         m_shouldHgStat = true;
         m_justMerged = true;
         break;