Mercurial > hg > easyhg
comparison mainwindow.cpp @ 356:368b96a87c43 feature_102
Add warning message when pushing with uncommitted changes. Fixes #102
author | Chris Cannam |
---|---|
date | Thu, 17 Mar 2011 13:44:44 +0000 |
parents | 93feb59187f5 |
children | ea6f76c0aa76 |
comparison
equal
deleted
inserted
replaced
355:a52970e7a6e0 | 356:368b96a87c43 |
---|---|
947 } | 947 } |
948 } | 948 } |
949 | 949 |
950 void MainWindow::hgPush() | 950 void MainWindow::hgPush() |
951 { | 951 { |
952 QString uncommittedNote; | |
953 if (m_hgTabs->canCommit()) { | |
954 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."); | |
955 } | |
956 | |
952 if (ConfirmCommentDialog::confirm | 957 if (ConfirmCommentDialog::confirm |
953 (this, tr("Confirm push"), | 958 (this, tr("Confirm push"), |
954 tr("<qt><h3>Push to remote repository?</h3></qt>"), | 959 tr("<qt><h3>Push to remote repository?</h3></qt>"), |
955 tr("<qt><p>You are about to push your changes to the remote repository at <code>%1</code>.</p></qt>").arg(xmlEncode(m_remoteRepoPath)), | 960 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), |
956 tr("Push"))) { | 961 tr("Push"))) { |
957 | 962 |
958 QStringList params; | 963 QStringList params; |
959 params << "push" << "--new-branch" << m_remoteRepoPath; | 964 params << "push" << "--new-branch" << m_remoteRepoPath; |
960 m_runner->requestAction(HgAction(ACT_PUSH, m_workFolderPath, params)); | 965 m_runner->requestAction(HgAction(ACT_PUSH, m_workFolderPath, params)); |