Mercurial > hg > easyhg
comparison mainwindow.cpp @ 42:9a89dedf260a
A couple of more fixes to "weird filenames" bug.
author | Jari Korhonen <jtkorhonen@gmail.com> |
---|---|
date | Thu, 24 Jun 2010 23:41:21 +0300 |
parents | 94bbc4b30b2a |
children | c32067cd19f8 |
comparison
equal
deleted
inserted
replaced
41:94bbc4b30b2a | 42:9a89dedf260a |
---|---|
222 QString currentFile = hgExp -> getCurrentFileListLine(); | 222 QString currentFile = hgExp -> getCurrentFileListLine(); |
223 | 223 |
224 if (areAllSelectedUntracked(hgExp -> workFolderFileList)) | 224 if (areAllSelectedUntracked(hgExp -> workFolderFileList)) |
225 { | 225 { |
226 //User wants to add selected file(s) | 226 //User wants to add selected file(s) |
227 params << "add"; | 227 params << "add" << "--"; |
228 | 228 |
229 QList <QListWidgetItem *> selList = hgExp -> workFolderFileList -> selectedItems(); | 229 QList <QListWidgetItem *> selList = hgExp -> workFolderFileList -> selectedItems(); |
230 | 230 |
231 for (int i = 0; i < selList.size(); ++i) | 231 for (int i = 0; i < selList.size(); ++i) |
232 { | 232 { |
292 if (!comment.isEmpty()) | 292 if (!comment.isEmpty()) |
293 { | 293 { |
294 if ((justMerged == false) && (areAllSelectedCommitable(hgExp -> workFolderFileList))) | 294 if ((justMerged == false) && (areAllSelectedCommitable(hgExp -> workFolderFileList))) |
295 { | 295 { |
296 //User wants to commit selected file(s) (and this is not merge commit, which would fail if we selected files) | 296 //User wants to commit selected file(s) (and this is not merge commit, which would fail if we selected files) |
297 params << "commit" << "--message" << comment << "--user" << userInfo; | 297 params << "commit" << "--message" << comment << "--user" << userInfo << "--"; |
298 | 298 |
299 QList <QListWidgetItem *> selList = hgExp -> workFolderFileList -> selectedItems(); | 299 QList <QListWidgetItem *> selList = hgExp -> workFolderFileList -> selectedItems(); |
300 for (int i = 0; i < selList.size(); ++i) | 300 for (int i = 0; i < selList.size(); ++i) |
301 { | 301 { |
302 QString tmp = selList.at(i)->text(); | 302 QString tmp = selList.at(i)->text(); |