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

Removed fossil() convenience function

Browse Source 
FossilOrigin-Name: 203cc502bcde134935f524fe2dd44a89e228bc62
This commit is contained in:
Kostas 2015-08-27 09:33:10 +00:00
parent 48034e7557
commit 37ba449083
4 changed files with 55 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Also\saddress\sQUrl\slocal-file\sweirdness\sin\sFossil::setRemoteUrl C Removed\sfossil()\sconvenience\sfunction
D 2015-08-27T09:22:36.928 D 2015-08-27T09:33:10.940
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
@ -232,8 +232,8 @@ 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 28f0155821d42c645c99fdd5214344c177cea3bc F src/MainWindow.cpp b94d6963f9fd00a81821e28d871eb21dc4764bac
F src/MainWindow.h 15f703522d1d6cd6239c8c8f037d158870b6b0b9 F src/MainWindow.h b01b04325edb926dfb289c2701e6c52e056f9708
F src/RemoteDialog.cpp d5d39871f319bb760405736ba0caa9e83ec51ea3 F src/RemoteDialog.cpp d5d39871f319bb760405736ba0caa9e83ec51ea3
F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
F src/RevisionDialog.cpp e58c4f8a704f00addebb15d521b76620fdafda79 F src/RevisionDialog.cpp e58c4f8a704f00addebb15d521b76620fdafda79
@ -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 b82bb671d80df48d001b639dcf58f6016cc3ab84 P 7f22404a2284727f7d41d9f00eac2992b6d848f0
R 7d139776023b3ef79dcc93ab198fcaa1 R 5caf3fc3d2a436faa8ec84feeb9e7642
U Kostas U Kostas
Z 2b40445b3b14975c713dc0a7a4a3fbe2 Z 9e495907b04c2ed51de7c9e81eace801

2
manifest.uuid
View File

@ -1 +1 @@
7f22404a2284727f7d41d9f00eac2992b6d848f0 203cc502bcde134935f524fe2dd44a89e228bc62

92
src/MainWindow.cpp
View File

@ -317,8 +317,8 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
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
fossil().Init(&uiCallback); getWorkspace().fossil().Init(&uiCallback);
fossil().setExecutablePath(settings.GetValue(FUEL_SETTING_FOSSIL_PATH).toString()); getWorkspace().fossil().setExecutablePath(settings.GetValue(FUEL_SETTING_FOSSIL_PATH).toString());
applySettings(); applySettings();
@ -401,7 +401,7 @@ bool MainWindow::openWorkspace(const QString &path)
} }
// Ok open the repository file // Ok open the repository file
if(!fossil().openRepository(fi.absoluteFilePath(), wkspace)) if(!getWorkspace().fossil().openRepository(fi.absoluteFilePath(), wkspace))
{ {
QMessageBox::critical(this, tr("Error"), tr("Could not open repository."), QMessageBox::Ok ); QMessageBox::critical(this, tr("Error"), tr("Could not open repository."), QMessageBox::Ok );
return false; return false;
@ -507,13 +507,13 @@ void MainWindow::on_actionNewRepository_triggered()
// Create repository // Create repository
QString repo_abs_path = repo_path_info.absoluteFilePath(); QString repo_abs_path = repo_path_info.absoluteFilePath();
if(!fossil().newRepository(repo_abs_path)) if(!getWorkspace().fossil().newRepository(repo_abs_path))
{ {
QMessageBox::critical(this, tr("Error"), tr("Could not create repository."), QMessageBox::Ok ); QMessageBox::critical(this, tr("Error"), tr("Could not create repository."), QMessageBox::Ok );
return; return;
} }
if(!fossil().openRepository(repo_abs_path, wkdir)) if(!getWorkspace().fossil().openRepository(repo_abs_path, wkdir))
{ {
QMessageBox::critical(this, tr("Error"), tr("Could not open repository."), QMessageBox::Ok ); QMessageBox::critical(this, tr("Error"), tr("Could not open repository."), QMessageBox::Ok );
return; return;
@ -529,14 +529,14 @@ void MainWindow::on_actionNewRepository_triggered()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void MainWindow::on_actionCloseRepository_triggered() void MainWindow::on_actionCloseRepository_triggered()
{ {
if(fossil().getRepoStatus()!=REPO_OK) if(getWorkspace().fossil().getRepoStatus()!=REPO_OK)
return; return;
if(QMessageBox::Yes !=DialogQuery(this, tr("Close Workspace"), tr("Are you sure you want to close this workspace?"))) if(QMessageBox::Yes !=DialogQuery(this, tr("Close Workspace"), tr("Are you sure you want to close this workspace?")))
return; return;
// Close Repo // Close Repo
if(!fossil().closeRepository()) if(!getWorkspace().fossil().closeRepository())
{ {
QMessageBox::critical(this, tr("Error"), tr("Cannot close the workspace.\nAre there still uncommitted changes available?"), QMessageBox::Ok ); QMessageBox::critical(this, tr("Error"), tr("Cannot close the workspace.\nAre there still uncommitted changes available?"), QMessageBox::Ok );
return; return;
@ -558,7 +558,7 @@ void MainWindow::on_actionCloneRepository_triggered()
stopUI(); stopUI();
if(!fossil().cloneRepository(repository, url, url_proxy)) if(!getWorkspace().fossil().cloneRepository(repository, url, url_proxy))
{ {
QMessageBox::critical(this, tr("Error"), tr("Could not clone the repository"), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not clone the repository"), QMessageBox::Ok);
return; return;
@ -689,7 +689,7 @@ bool MainWindow::scanWorkspace()
bool valid = true; bool valid = true;
// Load repository info // Load repository info
RepoStatus st = fossil().getRepoStatus(); RepoStatus st = getWorkspace().fossil().getRepoStatus();
QString status; QString status;
if(st==REPO_NOT_FOUND) if(st==REPO_NOT_FOUND)
@ -1280,7 +1280,7 @@ void MainWindow::fossilBrowse(const QString &fossilUrl)
bool use_internal = settings.GetValue(FUEL_SETTING_WEB_BROWSER).toInt() == 1; bool use_internal = settings.GetValue(FUEL_SETTING_WEB_BROWSER).toInt() == 1;
QUrl url = QUrl(fossil().getUIHttpAddress()+fossilUrl); QUrl url = QUrl(getWorkspace().fossil().getUIHttpAddress()+fossilUrl);
if(use_internal) if(use_internal)
{ {
@ -1453,9 +1453,9 @@ bool MainWindow::diffFile(const QString &repoFile)
{ {
const QString &gdiff = settings.GetFossilValue(FOSSIL_SETTING_GDIFF_CMD).toString(); const QString &gdiff = settings.GetFossilValue(FOSSIL_SETTING_GDIFF_CMD).toString();
if(!gdiff.isEmpty()) if(!gdiff.isEmpty())
return fossil().diffFile(repoFile, true); return getWorkspace().fossil().diffFile(repoFile, true);
else else
return fossil().diffFile(repoFile, false); return getWorkspace().fossil().diffFile(repoFile, false);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -1472,14 +1472,14 @@ void MainWindow::on_actionDiff_triggered()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
bool MainWindow::startUI() bool MainWindow::startUI()
{ {
bool started = fossil().startUI(""); bool started = getWorkspace().fossil().startUI("");
ui->actionFossilUI->setChecked(started); ui->actionFossilUI->setChecked(started);
return started; return started;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void MainWindow::stopUI() void MainWindow::stopUI()
{ {
fossil().stopUI(); getWorkspace().fossil().stopUI();
ui->webView->load(QUrl("about:blank")); ui->webView->load(QUrl("about:blank"));
ui->actionFossilUI->setChecked(false); ui->actionFossilUI->setChecked(false);
} }
@ -1487,7 +1487,7 @@ void MainWindow::stopUI()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
bool MainWindow::uiRunning() const bool MainWindow::uiRunning() const
{ {
return fossil().uiRunning(); return getWorkspace().fossil().uiRunning();
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -1594,7 +1594,7 @@ void MainWindow::on_actionCommit_triggered()
if(commit_files.size() != all_modified_files.size()) if(commit_files.size() != all_modified_files.size())
files = commit_files; files = commit_files;
if(!fossil().commitFiles(files, msg, branch_name, private_branch)) if(!getWorkspace().fossil().commitFiles(files, msg, branch_name, private_branch))
QMessageBox::critical(this, tr("Error"), tr("Could not commit changes."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not commit changes."), QMessageBox::Ok);
refresh(); refresh();
@ -1614,7 +1614,7 @@ void MainWindow::on_actionAdd_triggered()
return; return;
// Do Add // Do Add
if(!fossil().addFiles(selection)) if(!getWorkspace().fossil().addFiles(selection))
QMessageBox::critical(this, tr("Error"), tr("Could not add files."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not add files."), QMessageBox::Ok);
refresh(); refresh();
@ -1642,7 +1642,7 @@ void MainWindow::on_actionDelete_triggered()
// Remove repository files // Remove repository files
if(!repo_files.empty()) if(!repo_files.empty())
{ {
if(!fossil().removeFiles(repo_files, remove_local)) if(!getWorkspace().fossil().removeFiles(repo_files, remove_local))
QMessageBox::critical(this, tr("Error"), tr("Could not remove files."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not remove files."), QMessageBox::Ok);
} }
@ -1673,7 +1673,7 @@ void MainWindow::on_actionRevert_triggered()
return; return;
// Do Revert // Do Revert
if(!fossil().revertFiles(modified_files)) if(!getWorkspace().fossil().revertFiles(modified_files))
QMessageBox::critical(this, tr("Error"), tr("Could not revert files."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not revert files."), QMessageBox::Ok);
refresh(); refresh();
@ -1704,7 +1704,7 @@ void MainWindow::on_actionRename_triggered()
} }
// Do Rename // Do Rename
if(!fossil().renameFile(fi_before.filePath(), fi_after.filePath(), true)) if(!getWorkspace().fossil().renameFile(fi_before.filePath(), fi_after.filePath(), true))
QMessageBox::critical(this, tr("Error"), tr("Could not rename file '%0' to '%1'").arg(fi_before.filePath(), fi_after.filePath()), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not rename file '%0' to '%1'").arg(fi_before.filePath(), fi_after.filePath()), QMessageBox::Ok);
refresh(); refresh();
@ -1737,7 +1737,7 @@ void MainWindow::on_actionUndo_triggered()
QStringList res; QStringList res;
// Do test Undo // Do test Undo
if(!fossil().undoRepository(res, true)) if(!getWorkspace().fossil().undoRepository(res, true))
QMessageBox::critical(this, tr("Error"), tr("Could not undo changes."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not undo changes."), QMessageBox::Ok);
if(res.length()>0 && res[0]=="No undo or redo is available") if(res.length()>0 && res[0]=="No undo or redo is available")
@ -1747,7 +1747,7 @@ void MainWindow::on_actionUndo_triggered()
return; return;
// Do Undo // Do Undo
if(!fossil().undoRepository(res, false)) if(!getWorkspace().fossil().undoRepository(res, false))
QMessageBox::critical(this, tr("Error"), tr("Could not undo changes."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not undo changes."), QMessageBox::Ok);
refresh(); refresh();
@ -1757,7 +1757,7 @@ void MainWindow::on_actionUndo_triggered()
void MainWindow::on_actionAbout_triggered() void MainWindow::on_actionAbout_triggered()
{ {
QString fossil_ver; QString fossil_ver;
fossil().getFossilVersion(fossil_ver); getWorkspace().fossil().getFossilVersion(fossil_ver);
AboutDialog dlg(this, fossil_ver); AboutDialog dlg(this, fossil_ver);
dlg.exec(); dlg.exec();
@ -1781,7 +1781,7 @@ void MainWindow::loadFossilSettings()
// Also retrieve the fossil global settings // Also retrieve the fossil global settings
QStringList out; QStringList out;
if(!fossil().getFossilSettings(out)) if(!getWorkspace().fossil().getFossilSettings(out))
return; return;
QStringMap kv; QStringMap kv;
@ -1822,7 +1822,7 @@ void MainWindow::on_actionSettings_triggered()
if(!SettingsDialog::run(this, settings)) if(!SettingsDialog::run(this, settings))
return; return;
fossil().setExecutablePath(settings.GetValue(FUEL_SETTING_FOSSIL_PATH).toString()); getWorkspace().fossil().setExecutablePath(settings.GetValue(FUEL_SETTING_FOSSIL_PATH).toString());
updateCustomActions(); updateCustomActions();
} }
@ -1844,7 +1844,7 @@ void MainWindow::on_actionFossilSettings_triggered()
Q_ASSERT(type == Settings::Setting::TYPE_FOSSIL_GLOBAL || type == Settings::Setting::TYPE_FOSSIL_LOCAL); Q_ASSERT(type == Settings::Setting::TYPE_FOSSIL_GLOBAL || type == Settings::Setting::TYPE_FOSSIL_LOCAL);
QString value = it.value().Value.toString(); QString value = it.value().Value.toString();
fossil().setFossilSetting(name, value, type == Settings::Setting::TYPE_FOSSIL_GLOBAL); getWorkspace().fossil().setFossilSetting(name, value, type == Settings::Setting::TYPE_FOSSIL_GLOBAL);
} }
} }
@ -2064,7 +2064,7 @@ void MainWindow::on_actionRenameFolder_triggered()
WorkspaceFile *r = files_to_move[i]; WorkspaceFile *r = files_to_move[i];
const QString &new_file_path = new_paths[i] + PATH_SEPARATOR + r->getFilename(); const QString &new_file_path = new_paths[i] + PATH_SEPARATOR + r->getFilename();
if(!fossil().renameFile(r->getFilePath(), new_file_path, false)) if(!getWorkspace().fossil().renameFile(r->getFilePath(), new_file_path, false))
{ {
log(tr("Move aborted due to errors")+"\n"); log(tr("Move aborted due to errors")+"\n");
goto _exit; goto _exit;
@ -2204,7 +2204,7 @@ void MainWindow::on_actionCreateStash_triggered()
} }
// Do Stash // Do Stash
if(!fossil().stashNew(stashed_files, stash_name, revert)) if(!getWorkspace().fossil().stashNew(stashed_files, stash_name, revert))
QMessageBox::critical(this, tr("Error"), tr("Could not create stash."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not create stash."), QMessageBox::Ok);
refresh(); refresh();
@ -2229,7 +2229,7 @@ void MainWindow::on_actionApplyStash_triggered()
stashmap_t::iterator id_it = getWorkspace().getStashes().find(*it); stashmap_t::iterator id_it = getWorkspace().getStashes().find(*it);
Q_ASSERT(id_it!=getWorkspace().getStashes().end()); Q_ASSERT(id_it!=getWorkspace().getStashes().end());
if(!fossil().stashApply(*id_it)) if(!getWorkspace().fossil().stashApply(*id_it))
{ {
log(tr("Stash application aborted due to errors")+"\n"); log(tr("Stash application aborted due to errors")+"\n");
QMessageBox::critical(this, tr("Error"), tr("Could not apply stash."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not apply stash."), QMessageBox::Ok);
@ -2243,7 +2243,7 @@ void MainWindow::on_actionApplyStash_triggered()
stashmap_t::iterator id_it = getWorkspace().getStashes().find(*it); stashmap_t::iterator id_it = getWorkspace().getStashes().find(*it);
Q_ASSERT(id_it!=getWorkspace().getStashes().end()); Q_ASSERT(id_it!=getWorkspace().getStashes().end());
if(!fossil().stashDrop(*id_it)) if(!getWorkspace().fossil().stashDrop(*id_it))
{ {
log(tr("Stash deletion aborted due to errors")+"\n"); log(tr("Stash deletion aborted due to errors")+"\n");
QMessageBox::critical(this, tr("Error"), tr("Could not delete stash."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not delete stash."), QMessageBox::Ok);
@ -2272,7 +2272,7 @@ void MainWindow::on_actionDeleteStash_triggered()
stashmap_t::iterator id_it = getWorkspace().getStashes().find(*it); stashmap_t::iterator id_it = getWorkspace().getStashes().find(*it);
Q_ASSERT(id_it!=getWorkspace().getStashes().end()); Q_ASSERT(id_it!=getWorkspace().getStashes().end());
if(!fossil().stashDrop(*id_it)) if(!getWorkspace().fossil().stashDrop(*id_it))
{ {
log(tr("Stash deletion aborted due to errors")+"\n"); log(tr("Stash deletion aborted due to errors")+"\n");
QMessageBox::critical(this, tr("Error"), tr("Could not delete stash."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not delete stash."), QMessageBox::Ok);
@ -2296,7 +2296,7 @@ void MainWindow::on_actionDiffStash_triggered()
Q_ASSERT(id_it!=getWorkspace().getStashes().end()); Q_ASSERT(id_it!=getWorkspace().getStashes().end());
// Run diff // Run diff
if(!fossil().stashDiff(*id_it)) if(!getWorkspace().fossil().stashDiff(*id_it))
QMessageBox::critical(this, tr("Error"), tr("Could not diff stash."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not diff stash."), QMessageBox::Ok);
} }
@ -2444,7 +2444,7 @@ void MainWindow::dropEvent(QDropEvent *event)
return; return;
// Do Add // Do Add
if(!fossil().addFiles(newfiles)) if(!getWorkspace().fossil().addFiles(newfiles))
QMessageBox::critical(this, tr("Error"), tr("Could not add files."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not add files."), QMessageBox::Ok);
refresh(); refresh();
@ -2471,7 +2471,7 @@ void MainWindow::setBusy(bool busy)
void MainWindow::onAbort() void MainWindow::onAbort()
{ {
operationAborted = true; operationAborted = true;
fossil().abortOperation(); getWorkspace().fossil().abortOperation();
// FIXME: Rename this to something better, Operation Aborted // FIXME: Rename this to something better, Operation Aborted
log("<br><b>* "+tr("Terminated")+" *</b><br>", true); log("<br><b>* "+tr("Terminated")+" *</b><br>", true);
} }
@ -2544,7 +2544,7 @@ void MainWindow::updateRevision(const QString &revision)
QStringList res; QStringList res;
// Do test update // Do test update
if(!fossil().updateRepository(res, selected_revision, true)) if(!getWorkspace().fossil().updateRepository(res, selected_revision, true))
{ {
QMessageBox::critical(this, tr("Error"), tr("Could not update the repository."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not update the repository."), QMessageBox::Ok);
return; return;
@ -2563,7 +2563,7 @@ void MainWindow::updateRevision(const QString &revision)
return; return;
// Do update // Do update
if(!fossil().updateRepository(res, selected_revision, false)) if(!getWorkspace().fossil().updateRepository(res, selected_revision, false))
QMessageBox::critical(this, tr("Error"), tr("Could not update the repository."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not update the repository."), QMessageBox::Ok);
refresh(); refresh();
@ -2585,7 +2585,7 @@ void MainWindow::on_actionCreateTag_triggered()
return; return;
} }
if(!fossil().tagNew(name, revision)) if(!getWorkspace().fossil().tagNew(name, revision))
QMessageBox::critical(this, tr("Error"), tr("Could not create tag."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not create tag."), QMessageBox::Ok);
refresh(); refresh();
@ -2606,7 +2606,7 @@ void MainWindow::on_actionDeleteTag_triggered()
const QString &revision = getWorkspace().getTags()[tagname]; const QString &revision = getWorkspace().getTags()[tagname];
if(!fossil().tagDelete(tagname, revision)) if(!getWorkspace().fossil().tagDelete(tagname, revision))
QMessageBox::critical(this, tr("Error"), tr("Could not delete tag."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not delete tag."), QMessageBox::Ok);
refresh(); refresh();
@ -2628,7 +2628,7 @@ void MainWindow::on_actionCreateBranch_triggered()
return; return;
} }
if(!fossil().branchNew(branch_name, revision, false)) if(!getWorkspace().fossil().branchNew(branch_name, revision, false))
{ {
QMessageBox::critical(this, tr("Error"), tr("Could not create branch."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not create branch."), QMessageBox::Ok);
return; return;
@ -2651,7 +2651,7 @@ void MainWindow::mergeRevision(const QString &defaultRevision)
return; return;
// Do test merge // Do test merge
if(!fossil().branchMerge(res, revision, integrate, force, true)) if(!getWorkspace().fossil().branchMerge(res, revision, integrate, force, true))
{ {
QMessageBox::critical(this, tr("Error"), tr("Merge failed."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Merge failed."), QMessageBox::Ok);
return; return;
@ -2661,7 +2661,7 @@ void MainWindow::mergeRevision(const QString &defaultRevision)
return; return;
// Do update // Do update
if(!fossil().branchMerge(res, revision, integrate, force, false)) if(!getWorkspace().fossil().branchMerge(res, revision, integrate, force, false))
QMessageBox::critical(this, tr("Error"), tr("Merge failed."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Merge failed."), QMessageBox::Ok);
else else
log(tr("Merge completed. Don't forget to commit!")+"\n"); log(tr("Merge completed. Don't forget to commit!")+"\n");
@ -2751,7 +2751,7 @@ void MainWindow::on_actionPushRemote_triggered()
if(!url.isLocalFile()) if(!url.isLocalFile())
KeychainGet(this, url, *settings.GetStore()); KeychainGet(this, url, *settings.GetStore());
if(!fossil().pushRepository(url)) if(!getWorkspace().fossil().pushRepository(url))
QMessageBox::critical(this, tr("Error"), tr("Could not push to the remote repository."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not push to the remote repository."), QMessageBox::Ok);
} }
@ -2769,7 +2769,7 @@ void MainWindow::on_actionPullRemote_triggered()
if(!url.isLocalFile()) if(!url.isLocalFile())
KeychainGet(this, url, *settings.GetStore()); KeychainGet(this, url, *settings.GetStore());
if(!fossil().pullRepository(url)) if(!getWorkspace().fossil().pullRepository(url))
QMessageBox::critical(this, tr("Error"), tr("Could not pull from the remote repository."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not pull from the remote repository."), QMessageBox::Ok);
} }
@ -2788,7 +2788,7 @@ void MainWindow::on_actionPush_triggered()
if(!url.isLocalFile()) if(!url.isLocalFile())
KeychainGet(this, url, *settings.GetStore()); KeychainGet(this, url, *settings.GetStore());
if(!fossil().pushRepository(url)) if(!getWorkspace().fossil().pushRepository(url))
QMessageBox::critical(this, tr("Error"), tr("Could not push to the remote repository."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not push to the remote repository."), QMessageBox::Ok);
} }
@ -2807,7 +2807,7 @@ void MainWindow::on_actionPull_triggered()
if(!url.isLocalFile()) if(!url.isLocalFile())
KeychainGet(this, url, *settings.GetStore()); KeychainGet(this, url, *settings.GetStore());
if(!fossil().pullRepository(url)) if(!getWorkspace().fossil().pullRepository(url))
QMessageBox::critical(this, tr("Error"), tr("Could not pull from the remote repository."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not pull from the remote repository."), QMessageBox::Ok);
} }
@ -2831,7 +2831,7 @@ void MainWindow::on_actionSetDefaultRemote_triggered()
// so only set the remote url when there is no password set // so only set the remote url when there is no password set
if(url.password().isEmpty()) if(url.password().isEmpty())
{ {
if(!fossil().setRemoteUrl(url)) if(!getWorkspace().fossil().setRemoteUrl(url))
QMessageBox::critical(this, tr("Error"), tr("Could not set the remote repository."), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Could not set the remote repository."), QMessageBox::Ok);
} }
} }

4
src/MainWindow.h
View File

@ -194,9 +194,7 @@ private:
Workspace workspace; Workspace workspace;
Workspace & getWorkspace() { return workspace; } Workspace & getWorkspace() { return workspace; }
const Workspace & getWorkspace() const { return workspace; }
Fossil & fossil() { return workspace.fossil(); }
const Fossil & fossil() const { return workspace.fossil(); }
Settings &settings; Settings &settings;
QStringList workspaceHistory; QStringList workspaceHistory;