comparison mainwindow.cpp @ 294:fc9d411ff6e7

Fix some breakages from prior merge commit (oops); make merge result use more-information dialog

     if (n > 0) {
         head = tr("Pushed %n changeset(s)", "", n);
     } 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 {
         head = tr("Push complete");
     }

         report = tr("Your local repository already contains all changes found in the remote repository.");
     } else {
         head = tr("Pull complete");
     }
     m_runner->hide();
-
-    runner->hide();
 
     MoreInformationDialog::information(this, tr("Pull complete"),
                                        head, report, output);
 }
 

         MultiChoiceDialog::addRecentArgument("remote", m_workFolderPath, true);
         MoreInformationDialog::information
             (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;
         break;
         

         QMessageBox::information(this, tr("Update"), tr("<qt><h3>Update successful</h3><p>%1</p>").arg(xmlEncode(output)));
         m_shouldHgStat = true;
         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;
         
     case ACT_RETRY_MERGE: