AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Corrected saving of active workspace

Browse Source 
- Double-clicking a file now opens the file
- Corrected fossil error status parsing on windows
- Alternative method for storing the checkin messaage temporary file, since on windows fossil cannot access it.


FossilOrigin-Name: ebc405be8ad1ef5d86dff36a352528ccb363b3c9
This commit is contained in:
kostas
2011-08-27 20:22:36 +00:00
parent 5620a95627
commit c59d7596c4
3 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
MainWindow.cpp
View File

@ -500,7 +500,7 @@ MainWindow::RepoStatus MainWindow::getRepoStatus()
QStringList res;
int exit_code = EXIT_FAILURE;
// We need to differentiate the reason why fossil has failed
// We need to determine the reason why fossil has failed
// so we delay processing of the exit_code
if(!runFossilRaw(QStringList() << "info", &res, &exit_code, SILENT_STATUS))
return REPO_NOT_FOUND;
@ -509,11 +509,12 @@ MainWindow::RepoStatus MainWindow::getRepoStatus()
for(QStringList::iterator it=res.begin(); it!=res.end(); ++it)
{
QStringList tokens = it->split(":");
if(tokens.length()!=2)
int col_index = it->indexOf(':');
if(col_index==-1)
continue;
QString key = tokens[0].trimmed();
QString value = tokens[1].trimmed();
QString key = it->left(col_index).trimmed();
QString value = it->mid(col_index+1).trimmed();
if(key=="fossil")
{
@ -642,14 +643,12 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
else
last_line = buffer;
QChar cc = buffer[last_line_start];
last_line = last_line.trimmed();
// Check if we have a query
bool ends_qmark = !last_line.isEmpty() && last_line[last_line.length()-1]=='?';
bool have_yn_query = last_line.toLower().indexOf("y/n")!=-1;
int have_yna_query = last_line.toLower().indexOf("a=always/y/n")!=-1;
int have_yna_query = last_line.toLower().indexOf("a=always/y/n")!=-1 || last_line.toLower().indexOf("yes/no/all")!=-1;
bool have_query = ends_qmark && (have_yn_query || have_yna_query);
// Flush only the unneccessary part of the buffer to the log
@ -800,6 +799,8 @@ void MainWindow::saveSettings()
qsettings.setValue("Path", workspaceHistory[i]);
if(getCurrentWorkspace() == workspaceHistory[i])
qsettings.setValue("Active", true);
else
qsettings.remove("Active");
}
qsettings.endArray();
@ -937,7 +938,7 @@ void MainWindow::on_actionHistory_triggered()
//------------------------------------------------------------------------------
void MainWindow::on_tableView_doubleClicked(const QModelIndex &/*index*/)
{
on_actionDiff_triggered();
on_actionOpenFile_triggered();
}
//------------------------------------------------------------------------------
@ -980,16 +981,30 @@ void MainWindow::on_actionCommit_triggered()
// Do commit
commitMessages.push_front(msg);
QString comment_fname;
{
QTemporaryFile comment_file;
comment_file.open();
comment_file.write(msg.toUtf8());
comment_file.close();
runFossil(QStringList() << "commit" << "--message-file" << QuotePath(comment_file.fileName()) << QuotePaths(modified_files) );
QTemporaryFile temp_file;
if(!temp_file.open())
{
QMessageBox::critical(this, tr("Error"), tr("Could not generate comment file"), QMessageBox::Ok );
return;
}
comment_fname = temp_file.fileName();
}
QFile comment_file(comment_fname);
if(!comment_file.open(QIODevice::WriteOnly))
{
QMessageBox::critical(this, tr("Error"), tr("Could not generate comment file"), QMessageBox::Ok );
return;
}
comment_file.write(msg.toUtf8());
comment_file.close();
runFossil(QStringList() << "commit" << "--message-file" << QuotePath(comment_fname) << QuotePaths(modified_files) );
QFile::remove(comment_fname);
refresh();
}