Mercurial > hg > easyhg

changeset 356:368b96a87c43 feature_102

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add warning message when pushing with uncommitted changes. Fixes #102
author Chris Cannam
date Thu, 17 Mar 2011 13:44:44 +0000
parents a52970e7a6e0
children 4373061dd20e
files mainwindow.cpp
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mainwindow.cpp	Thu Mar 17 12:53:34 2011 +0000
+++ b/mainwindow.cpp	Thu Mar 17 13:44:44 2011 +0000
@@ -949,10 +949,15 @@
 
 void MainWindow::hgPush()
 {
+    QString uncommittedNote;
+    if (m_hgTabs->canCommit()) {
+        uncommittedNote = tr("<p><b>Note:</b> You have uncommitted changes.  If you want to push these changes to the remote repository, you need to commit them first.");
+    }
+
     if (ConfirmCommentDialog::confirm
         (this, tr("Confirm push"),
          tr("<qt><h3>Push to remote repository?</h3></qt>"),
-         tr("<qt><p>You are about to push your changes to the remote repository at <code>%1</code>.</p></qt>").arg(xmlEncode(m_remoteRepoPath)),
+         tr("<qt><p>You are about to push your commits to the remote repository at <code>%1</code>.</p>%2</qt>").arg(xmlEncode(m_remoteRepoPath)).arg(uncommittedNote),
          tr("Push"))) {
 
         QStringList params;