Mercurial > hg > easyhg

changeset 127:758471b71721

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Don't provide file list when committing, if the user didn't select files. Previously we (perhaps inadvertantly) used a list of all files because we had generated that for display -- but it breaks merge-commits and it's probably unwise to mess with very long command lines.
author Chris Cannam
date Mon, 29 Nov 2010 17:48:43 +0000
parents f41bbd0c7c27
children fcaf09ee825d
files mainwindow.cpp
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mainwindow.cpp	Mon Nov 29 17:11:29 2010 +0000
+++ b/mainwindow.cpp	Mon Nov 29 17:48:43 2010 +0000
@@ -303,14 +303,15 @@
     QString comment;
 
     QStringList files = hgTabs->getSelectedCommittableFiles();
-    if (files.empty()) files = hgTabs->getAllCommittableFiles();
+    QStringList reportFiles = files;
+    if (reportFiles.empty()) reportFiles = hgTabs->getAllCommittableFiles();
 
     if (ConfirmCommentDialog::confirmAndGetLongComment
         (this,
          tr("Commit files"),
          tr("<h3>Commit files</h3><p>You are about to commit the following files:"),
          tr("<h3>Commit files</h3><p>You are about to commit %1 files."),
-         files,
+         reportFiles,
          comment)) {
 
         if ((justMerged == false) && //!!! review usage of justMerged, and how it interacts with asynchronous request queue
@@ -513,7 +514,7 @@
     if (ConfirmCommentDialog::confirmDangerousFilesAction
         (this,
          tr("Revert files"),
-         tr("<h3>Revert files</h3><p>You are about to <b>revert</b> the following files to their previous committed state.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed."),
+         tr("<h3>Revert files</h3><p>You are about to <b>revert</b> the following files to their previous committed state.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed:"),
          tr("<h3>Revert files</h3><p>You are about to <b>revert</b> %1 files.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed."),
          files)) {