Mercurial > hg > easyhg

comparison src/confirmcommentdialog.cpp @ 505:1c05e7576ea5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes
author Chris Cannam
date Mon, 17 Oct 2011 16:25:02 +0100
parents 50920723dd16
children 533519ebc0cb
comparison
equal deleted inserted replaced
504:d972f0cd61b3 505:1c05e7576ea5
89 89
90 if (intro == "") text = "<qt>"; 90 if (intro == "") text = "<qt>";
91 else text = "<qt>" + intro + "<p>"; 91 else text = "<qt>" + intro + "<p>";
92 92
93 text += "<code>"; 93 text += "<code>";
94 foreach (QString file, files) { 94 if (files.empty()) {
95 text += "&nbsp;&nbsp;&nbsp;" + xmlEncode(file) + "<br>"; 95 text += "&nbsp;&nbsp;&nbsp;</code>";
96 } 96 text += tr("(no files: metadata only)");
97 text += "</code></qt>"; 97 } else {
98 foreach (QString file, files) {
99 text += "&nbsp;&nbsp;&nbsp;" + xmlEncode(file) + "<br>";
100 }
101 text += "</code></qt>";
102 }
98 103
99 return text; 104 return text;
100 } 105 }
101 106
102 bool ConfirmCommentDialog::confirm(QWidget *parent, 107 bool ConfirmCommentDialog::confirm(QWidget *parent,