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

Removed all path conversion for the gdiff and gmerge settings.

Browse Source 
The settings are now stored in the platform native format. This should fix the issue where fuel was providing fossil with an incorrect command line for the gmerge setting

FossilOrigin-Name: c57c6d52cc3314fdf7a261ec5d23f84da7cb55ea
This commit is contained in:
Kostas 2014-08-06 10:06:10 +00:00
parent 95583e744e
commit 559664f021
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Added\sHTTP\sProxy\ssupport\sduring\sclone\nAdded\sfile\sdialog\sfor\sselecting\sa\slocal\ssource\srepository\sfor\scloning\n
D 2014-08-06T09:26:38.427
C Removed\sall\spath\sconversion\sfor\sthe\sgdiff\sand\sgmerge\ssettings.\nThe\ssettings\sare\snow\sstored\sin\sthe\splatform\snative\sformat.\sThis\sshould\sfix\sthe\sissue\swhere\sfuel\swas\sproviding\sfossil\swith\san\sincorrect\scommand\sline\sfor\sthe\sgmerge\ssetting
D 2014-08-06T10:06:10.992
F dist/arch/PKGBUILD 1d72dad77767f94a6b1a018067188e61927fa564
F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381
@ -187,9 +187,9 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp 37cb55d2f4aa76b10b62ea26f587d0274a0d2825
F src/MainWindow.cpp f321f9e0b9aa3f55966f3c19fb3d3c3488676fe1
F src/MainWindow.h dc0a9ed7de8a338e56c38c00ec303796f31bd24d
F src/SettingsDialog.cpp effff92f746a71b07f0e6a72a21caac5a9085123
F src/SettingsDialog.cpp 515166bcaedf16432208bf8ef6bffec1529b1198
F src/SettingsDialog.h 01c1f876c64f750ba8820a0d745e377acabe4921
F src/Utils.cpp 9aff456712e4276b49083426301b3b96d3819c77
F src/Utils.h c546e478a1225a28c99cd4c30f70cf9be9804a2a
@ -201,7 +201,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/MainWindow.ui 7ede8bbb54513e0771fdf5d5a2566d88c81b73ad
F ui/SettingsDialog.ui 55aefad7145c40d936c43759789d1b50e361b020
P ab62f1bafdc523e1ea7e661676aeb49c82ed93e0
R 00c2d284c49659d6bd8cdefc48dda277
P 872751fabaa47ac1f1f9d4caa4bdb42ae2e371cd
R c0ce9739ba0809720ddd275ca5e66571
U Kostas
Z ce59286858ace7eb1a835975ddb00b23
Z 0f01ed065c4316a05b26b5aa37511ad2

2
manifest.uuid
View File

@ -1 +1 @@
872751fabaa47ac1f1f9d4caa4bdb42ae2e371cd
c57c6d52cc3314fdf7a261ec5d23f84da7cb55ea

2
src/MainWindow.cpp
View File

@ -2150,7 +2150,7 @@ void MainWindow::on_actionSettings_triggered()
if(value.isEmpty())
params << "unset" << name;
else
params << "settings" << name << "\"" + value + "\"";
params << "settings" << name << value;
if(type == Settings::Setting::TYPE_FOSSIL_GLOBAL)
params << "-global";

10
src/SettingsDialog.cpp
View File

@ -67,8 +67,8 @@ SettingsDialog::SettingsDialog(QWidget *parent, Settings &_settings) :
LangIdToName(lang)));
// Repo Settings
ui->lineGDiffCommand->setText(QDir::toNativeSeparators(settings->GetFossilValue(FOSSIL_SETTING_GDIFF_CMD).toString()));
ui->lineGMergeCommand->setText(QDir::toNativeSeparators(settings->GetFossilValue(FOSSIL_SETTING_GMERGE_CMD).toString()));
ui->lineGDiffCommand->setText(settings->GetFossilValue(FOSSIL_SETTING_GDIFF_CMD).toString());
ui->lineGMergeCommand->setText(settings->GetFossilValue(FOSSIL_SETTING_GMERGE_CMD).toString());
ui->lineRemoteURL->setText(settings->GetFossilValue(FOSSIL_SETTING_REMOTE_URL).toString());
ui->lineIgnore->setText(settings->GetFossilValue(FOSSIL_SETTING_IGNORE_GLOB).toString());
ui->lineIgnoreCRNL->setText(settings->GetFossilValue(FOSSIL_SETTING_CRNL_GLOB).toString());
@ -105,8 +105,8 @@ void SettingsDialog::on_buttonBox_accepted()
if(curr_langid != new_langid)
QMessageBox::information(this, tr("Restart required"), tr("The language change will take effect after restarting the application"), QMessageBox::Ok);
settings->SetFossilValue(FOSSIL_SETTING_GDIFF_CMD, QDir::fromNativeSeparators(ui->lineGDiffCommand->text()));
settings->SetFossilValue(FOSSIL_SETTING_GMERGE_CMD, QDir::fromNativeSeparators(ui->lineGMergeCommand->text()));
settings->SetFossilValue(FOSSIL_SETTING_GDIFF_CMD, ui->lineGDiffCommand->text());
settings->SetFossilValue(FOSSIL_SETTING_GMERGE_CMD, ui->lineGMergeCommand->text());
settings->SetFossilValue(FOSSIL_SETTING_REMOTE_URL, ui->lineRemoteURL->text());
settings->SetFossilValue(FOSSIL_SETTING_IGNORE_GLOB, ui->lineIgnore->text());
settings->SetFossilValue(FOSSIL_SETTING_CRNL_GLOB, ui->lineIgnoreCRNL->text());
@ -135,7 +135,7 @@ void SettingsDialog::on_btnSelectGMerge_clicked()
{
QString path = SelectExe(this, tr("Select Graphical Merge application"));
if(!path.isEmpty())
ui->lineGMergeCommand->setText(QDir::toNativeSeparators(path));
ui->lineGMergeCommand->setText(path);
}
//-----------------------------------------------------------------------------