Mercurial > hg > easyhg
comparison mainwindow.cpp @ 294:fc9d411ff6e7
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 |
comparison
equal
deleted
inserted
replaced
293:7b4f42cfc596 | 294:fc9d411ff6e7 |
---|---|
1597 if (n > 0) { | 1597 if (n > 0) { |
1598 head = tr("Pushed %n changeset(s)", "", n); | 1598 head = tr("Pushed %n changeset(s)", "", n); |
1599 } else if (n == 0) { | 1599 } else if (n == 0) { |
1600 head = tr("No changes to push"); | 1600 head = tr("No changes to push"); |
1601 report = tr("The remote repository already contains all changes that have been committed locally."); | 1601 report = tr("The remote repository already contains all changes that have been committed locally."); |
1602 if (hgTabs->canCommit()) { | 1602 if (m_hgTabs->canCommit()) { |
1603 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); | 1603 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); |
1604 } | 1604 } |
1605 } else { | 1605 } else { |
1606 head = tr("Push complete"); | 1606 head = tr("Push complete"); |
1607 } | 1607 } |
1624 report = tr("Your local repository already contains all changes found in the remote repository."); | 1624 report = tr("Your local repository already contains all changes found in the remote repository."); |
1625 } else { | 1625 } else { |
1626 head = tr("Pull complete"); | 1626 head = tr("Pull complete"); |
1627 } | 1627 } |
1628 m_runner->hide(); | 1628 m_runner->hide(); |
1629 | |
1630 runner->hide(); | |
1631 | 1629 |
1632 MoreInformationDialog::information(this, tr("Pull complete"), | 1630 MoreInformationDialog::information(this, tr("Pull complete"), |
1633 head, report, output); | 1631 head, report, output); |
1634 } | 1632 } |
1635 | 1633 |
1875 MultiChoiceDialog::addRecentArgument("remote", m_workFolderPath, true); | 1873 MultiChoiceDialog::addRecentArgument("remote", m_workFolderPath, true); |
1876 MoreInformationDialog::information | 1874 MoreInformationDialog::information |
1877 (this, | 1875 (this, |
1878 tr("Clone"), | 1876 tr("Clone"), |
1879 tr("Clone successful"), | 1877 tr("Clone successful"), |
1880 tr("The remote repository <pre>%1</pre> was successfully cloned to the local folder <pre>%2</pre>.").arg(remoteRepoPath).arg(workFolderPath), | 1878 tr("The remote repository <pre>%1</pre> was successfully cloned to the local folder <pre>%2</pre>.").arg(m_remoteRepoPath).arg(m_workFolderPath), |
1881 output); | 1879 output); |
1882 enableDisableActions(); | 1880 enableDisableActions(); |
1883 m_shouldHgStat = true; | 1881 m_shouldHgStat = true; |
1884 break; | 1882 break; |
1885 | 1883 |
1984 QMessageBox::information(this, tr("Update"), tr("<qt><h3>Update successful</h3><p>%1</p>").arg(xmlEncode(output))); | 1982 QMessageBox::information(this, tr("Update"), tr("<qt><h3>Update successful</h3><p>%1</p>").arg(xmlEncode(output))); |
1985 m_shouldHgStat = true; | 1983 m_shouldHgStat = true; |
1986 break; | 1984 break; |
1987 | 1985 |
1988 case ACT_MERGE: | 1986 case ACT_MERGE: |
1989 //!!! use format3? | 1987 MoreInformationDialog::information |
1990 QMessageBox::information(this, tr("Merge"), tr("<qt><h3>Merge successful</h3><pre>%1</pre>").arg(xmlEncode(output))); | 1988 (this, tr("Merge"), tr("Merge successful"), |
1989 tr("The merge succeeded. Remember to commit the result!"), | |
1990 output); | |
1991 m_shouldHgStat = true; | 1991 m_shouldHgStat = true; |
1992 m_justMerged = true; | 1992 m_justMerged = true; |
1993 break; | 1993 break; |
1994 | 1994 |
1995 case ACT_RETRY_MERGE: | 1995 case ACT_RETRY_MERGE: |