Mercurial > hg > easyhg
comparison mainwindow.cpp @ 288:ca6edd303c9d
Add "Summarise changes" options to changeset item right-button menu (already existed for uncommitted item)
author | Chris Cannam |
---|---|
date | Mon, 21 Feb 2011 11:37:58 +0000 |
parents | a68801b31ceb |
children | 37f67999b661 |
comparison
equal
deleted
inserted
replaced
285:769ab0fa125d | 288:ca6edd303c9d |
---|---|
543 { | 543 { |
544 QStringList params; | 544 QStringList params; |
545 | 545 |
546 params << "diff" << "--stat"; | 546 params << "diff" << "--stat"; |
547 | 547 |
548 m_runner->requestAction(HgAction(ACT_DIFF_SUMMARY, m_workFolderPath, params)); | 548 m_runner->requestAction(HgAction(ACT_UNCOMMITTED_SUMMARY, m_workFolderPath, params)); |
549 } | 549 } |
550 | 550 |
551 void MainWindow::hgFolderDiff() | 551 void MainWindow::hgFolderDiff() |
552 { | 552 { |
553 QString diff = getDiffBinaryName(); | 553 QString diff = getDiffBinaryName(); |
596 params << "--program" << diff; | 596 params << "--program" << diff; |
597 params << "--rev" << Changeset::hashOf(parent) | 597 params << "--rev" << Changeset::hashOf(parent) |
598 << "--rev" << Changeset::hashOf(child); | 598 << "--rev" << Changeset::hashOf(child); |
599 | 599 |
600 m_runner->requestAction(HgAction(ACT_CHGSETDIFF, m_workFolderPath, params)); | 600 m_runner->requestAction(HgAction(ACT_CHGSETDIFF, m_workFolderPath, params)); |
601 } | |
602 | |
603 | |
604 void MainWindow::hgShowSummaryToParent(QString child, QString parent) | |
605 { | |
606 QStringList params; | |
607 | |
608 params << "diff" << "--stat" | |
609 << "--rev" << Changeset::hashOf(parent) | |
610 << "--rev" << Changeset::hashOf(child); | |
611 | |
612 m_runner->requestAction(HgAction(ACT_DIFF_SUMMARY, m_workFolderPath, params)); | |
601 } | 613 } |
602 | 614 |
603 | 615 |
604 void MainWindow::hgUpdate() | 616 void MainWindow::hgUpdate() |
605 { | 617 { |
1895 case ACT_TAG: | 1907 case ACT_TAG: |
1896 m_needNewLog = true; | 1908 m_needNewLog = true; |
1897 m_shouldHgStat = true; | 1909 m_shouldHgStat = true; |
1898 break; | 1910 break; |
1899 | 1911 |
1900 case ACT_DIFF_SUMMARY: | 1912 case ACT_UNCOMMITTED_SUMMARY: |
1901 QMessageBox::information(this, tr("Change summary"), | 1913 QMessageBox::information(this, tr("Change summary"), |
1902 format3(tr("Summary of uncommitted changes"), | 1914 format3(tr("Summary of uncommitted changes"), |
1903 "", | 1915 "", |
1904 output)); | 1916 output)); |
1917 break; | |
1918 | |
1919 case ACT_DIFF_SUMMARY: | |
1920 if (output == "") { | |
1921 // Can happen, for a merge commit | |
1922 QMessageBox::information(this, tr("Change summary"), | |
1923 format3(tr("Summary of changes"), | |
1924 tr("No changes"), | |
1925 output)); | |
1926 } else { | |
1927 QMessageBox::information(this, tr("Change summary"), | |
1928 format3(tr("Summary of changes"), | |
1929 "", | |
1930 output)); | |
1931 } | |
1905 break; | 1932 break; |
1906 | 1933 |
1907 case ACT_FOLDERDIFF: | 1934 case ACT_FOLDERDIFF: |
1908 case ACT_CHGSETDIFF: | 1935 case ACT_CHGSETDIFF: |
1909 case ACT_SERVE: | 1936 case ACT_SERVE: |
2076 connect(m_hgTabs, SIGNAL(diffToCurrent(QString)), | 2103 connect(m_hgTabs, SIGNAL(diffToCurrent(QString)), |
2077 this, SLOT(hgDiffToCurrent(QString))); | 2104 this, SLOT(hgDiffToCurrent(QString))); |
2078 | 2105 |
2079 connect(m_hgTabs, SIGNAL(diffToParent(QString, QString)), | 2106 connect(m_hgTabs, SIGNAL(diffToParent(QString, QString)), |
2080 this, SLOT(hgDiffToParent(QString, QString))); | 2107 this, SLOT(hgDiffToParent(QString, QString))); |
2108 | |
2109 connect(m_hgTabs, SIGNAL(showSummaryToParent(QString, QString)), | |
2110 this, SLOT(hgShowSummaryToParent(QString, QString))); | |
2081 | 2111 |
2082 connect(m_hgTabs, SIGNAL(mergeFrom(QString)), | 2112 connect(m_hgTabs, SIGNAL(mergeFrom(QString)), |
2083 this, SLOT(hgMergeFrom(QString))); | 2113 this, SLOT(hgMergeFrom(QString))); |
2084 | 2114 |
2085 connect(m_hgTabs, SIGNAL(tag(QString)), | 2115 connect(m_hgTabs, SIGNAL(tag(QString)), |