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

Fossil::Init now requires a path to the fossil executable

Browse Source 
FossilOrigin-Name: ee09b7f597c4ab4b81a24c281ab33893f3c20ed6
This commit is contained in:
Kostas
2015-08-27 12:00:28 +00:00
parent 2541fc79f8
commit 765aa9a6d8
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@@ -1,5 +1,5 @@
C Moved\sFossil\soperation\sabortion\slogic\sto\sUICallback C Fossil::Init\snow\srequires\sa\spath\sto\sthe\sfossil\sexecutable
D 2015-08-27T11:26:04.935 D 2015-08-27T12:00:28.915
F .fossil-settings/manifest a09a968bf05a50058f3ad50132730b719bc39e76 F .fossil-settings/manifest a09a968bf05a50058f3ad50132730b719bc39e76
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
@@ -226,13 +226,13 @@ F src/FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8
F src/FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce F src/FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2 F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
F src/Fossil.cpp 298629ba4435906cc3dc261be66be9d4256e7791 F src/Fossil.cpp 98a9f7032ef53eafb71fef41159ec97ca7d1008a
F src/Fossil.h d89f5fa775a8294763bc29b814b8e4fcf06c3bc9 F src/Fossil.h 0601beebc3c8cb11abb679691b94207a9a5c2f84
F src/FslSettingsDialog.cpp e00907d493fba469e48a008aecda88426350b5ac F src/FslSettingsDialog.cpp e00907d493fba469e48a008aecda88426350b5ac
F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp 290557fca82bbe3e005a0343617c9c8a3501ae11 F src/MainWindow.cpp 37bda20f00b73a2e2f7a170e5eb29749a06c7041
F src/MainWindow.h b358227a96adb3afdf10566367478d76283acc91 F src/MainWindow.h b358227a96adb3afdf10566367478d76283acc91
F src/RemoteDialog.cpp d5d39871f319bb760405736ba0caa9e83ec51ea3 F src/RemoteDialog.cpp d5d39871f319bb760405736ba0caa9e83ec51ea3
F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
@@ -261,7 +261,7 @@ F ui/MainWindow.ui e2a18caa7482b3ee0dff477592cdc9574b35fe4f
F ui/RemoteDialog.ui 424b2d4a3d0162f84fdccf6af02c1cfce07a06f5 F ui/RemoteDialog.ui 424b2d4a3d0162f84fdccf6af02c1cfce07a06f5
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1 F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1
P ef3e63fb4f82a4a6224f6616f0f70e5546a39243 P eaec54a0320c199d5e1133b38acfafa3da82228e
R 825fa9244fa3344e32042bcfde4c74e4 R 8c5cc7026dce6c43c834603f6ffe3238
U Kostas U Kostas
Z a0abc935aac2b1476573aba9e97f1b3e Z 456afb0a08b1115c953be0a118b74952

2
manifest.uuid
View File

@@ -1 +1 @@
eaec54a0320c199d5e1133b38acfafa3da82228e ee09b7f597c4ab4b81a24c281ab33893f3c20ed6

3
src/Fossil.cpp
View File

@@ -17,11 +17,12 @@ Fossil::Fossil()
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
void Fossil::Init(UICallback *callback) void Fossil::Init(UICallback *callback, const QString &exePath)
{ {
uiCallback = callback; uiCallback = callback;
fossilPath.clear(); fossilPath.clear();
workspacePath.clear(); workspacePath.clear();
setExePath(exePath);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
src/Fossil.h
View File

@@ -21,7 +21,7 @@ public:
}; };
Fossil(); Fossil();
void Init(UICallback *callback); void Init(UICallback *callback, const QString &exePath);
// Repositories // Repositories
bool createRepository(const QString &repositoryPath); bool createRepository(const QString &repositoryPath);

4
src/MainWindow.cpp
View File

@@ -316,9 +316,9 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
viewMode = VIEWMODE_TREE; viewMode = VIEWMODE_TREE;
uiCallback.init(this); uiCallback.init(this);
// Need to be before applySettings which sets the last workspace // Need to be before applySettings which sets the last workspace
getWorkspace().fossil().Init(&uiCallback); getWorkspace().fossil().Init(&uiCallback, settings.GetValue(FUEL_SETTING_FOSSIL_PATH).toString());
getWorkspace().fossil().setExePath(settings.GetValue(FUEL_SETTING_FOSSIL_PATH).toString());
applySettings(); applySettings();