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

Use the fossil settings to determine whether gdiff or diff should be used for diffing files

Browse Source 
FossilOrigin-Name: b3dc68271fb2d6fbbe80060d3ec3d206f5f0097f
This commit is contained in:
Kostas 2015-08-14 11:09:22 +00:00
parent 0dcea2a332
commit adaee79179
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Minor\sUI\stweaks
D 2015-08-14T10:43:09.775
C Use\sthe\sfossil\ssettings\sto\sdetermine\swhether\sgdiff\sor\sdiff\sshould\sbe\sused\sfor\sdiffing\sfiles\n
D 2015-08-14T11:09:22.661
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -231,7 +231,7 @@ F src/FslSettingsDialog.cpp e00907d493fba469e48a008aecda88426350b5ac
F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp f46ad6800657330ac6772dc1a512c262b60e6f59
F src/MainWindow.cpp 95c233940710e89493c65d262b85fc7744345b1f
F src/MainWindow.h f4cffbe4d360d30aa2eeaa25fc6d50d0a39c617f
F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac
F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
@ -260,7 +260,7 @@ F ui/MainWindow.ui f9774e6dddb9462d8072bffd6c511bee7f470b9d
F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d
P 28d8e8098a1f1d19ce8494c1926dad0490632b82
R 0a71e4b8f8d8221784f984c25712dba7
P 49797e154e77b27ff722edee9654e1b7d42a04cd
R 7d1ddd48e769171ede9b51bd2a7d4862
U Kostas
Z ff23988d9eb6b4fa4d6dc2c91f7e6875
Z 76681fb1fe711f091cba0083d28b4fe5

2
manifest.uuid
View File

@ -1 +1 @@
49797e154e77b27ff722edee9654e1b7d42a04cd
b3dc68271fb2d6fbbe80060d3ec3d206f5f0097f

5
src/MainWindow.cpp
View File

@ -1400,8 +1400,9 @@ void MainWindow::getSelectionRemotes(QStringList &remoteUrls)
//------------------------------------------------------------------------------
bool MainWindow::diffFile(const QString &repoFile)
{
if(fossil().diffFile(repoFile, true))
return true;
const QString &gdiff = settings.GetFossilValue(FOSSIL_SETTING_GDIFF_CMD).toString();
if(!gdiff.isEmpty())
return fossil().diffFile(repoFile, true);
else
return fossil().diffFile(repoFile, false);
}