comparison mainwindow.cpp @ 288:ca6edd303c9d

Add "Summarise changes" options to changeset item right-button menu (already existed for uncommitted item)

 {
     QStringList params;
     
     params << "diff" << "--stat";
 
-    m_runner->requestAction(HgAction(ACT_DIFF_SUMMARY, m_workFolderPath, params));
+    m_runner->requestAction(HgAction(ACT_UNCOMMITTED_SUMMARY, m_workFolderPath, params));
 }
 
 void MainWindow::hgFolderDiff()
 {
     QString diff = getDiffBinaryName();

     params << "--program" << diff;
     params << "--rev" << Changeset::hashOf(parent)
            << "--rev" << Changeset::hashOf(child);
 
     m_runner->requestAction(HgAction(ACT_CHGSETDIFF, m_workFolderPath, params));
+}
+
+
+void MainWindow::hgShowSummaryToParent(QString child, QString parent)
+{
+    QStringList params;
+
+    params << "diff" << "--stat"
+           << "--rev" << Changeset::hashOf(parent)
+           << "--rev" << Changeset::hashOf(child);
+
+    m_runner->requestAction(HgAction(ACT_DIFF_SUMMARY, m_workFolderPath, params));
 }
 
 
 void MainWindow::hgUpdate()
 {

     case ACT_TAG:
         m_needNewLog = true;
         m_shouldHgStat = true;
         break;
 
-    case ACT_DIFF_SUMMARY:
+    case ACT_UNCOMMITTED_SUMMARY:
         QMessageBox::information(this, tr("Change summary"),
                                  format3(tr("Summary of uncommitted changes"),
                                          "",
                                          output));
+        break;
+
+    case ACT_DIFF_SUMMARY:
+        if (output == "") {
+            // Can happen, for a merge commit
+            QMessageBox::information(this, tr("Change summary"),
+                                     format3(tr("Summary of changes"),
+                                             tr("No changes"),
+                                             output));
+        } else {
+            QMessageBox::information(this, tr("Change summary"),
+                                     format3(tr("Summary of changes"),
+                                             "",
+                                             output));
+        }            
         break;
 
     case ACT_FOLDERDIFF:
     case ACT_CHGSETDIFF:
     case ACT_SERVE:

     connect(m_hgTabs, SIGNAL(diffToCurrent(QString)),
             this, SLOT(hgDiffToCurrent(QString)));
 
     connect(m_hgTabs, SIGNAL(diffToParent(QString, QString)),
             this, SLOT(hgDiffToParent(QString, QString)));
+
+    connect(m_hgTabs, SIGNAL(showSummaryToParent(QString, QString)),
+            this, SLOT(hgShowSummaryToParent(QString, QString)));
 
     connect(m_hgTabs, SIGNAL(mergeFrom(QString)),
             this, SLOT(hgMergeFrom(QString)));
 
     connect(m_hgTabs, SIGNAL(tag(QString)),