# HG changeset patch
# User Chris Cannam
# Date 1300369505 0
# Node ID 4373061dd20ee9980b2f0841d2d2afdf4e3193af
# Parent  a52970e7a6e0180b0578fdf5be080a8c1d54bcb5# Parent  368b96a87c432bbc97e4e8525d5de9afd7c6f589
Merge from branch "feature_102"

diff -r a52970e7a6e0 -r 4373061dd20e mainwindow.cpp
--- a/mainwindow.cpp	Thu Mar 17 12:53:34 2011 +0000
+++ b/mainwindow.cpp	Thu Mar 17 13:45:05 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;