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

Renamed Bridge to Fossil

Browse Source 
FossilOrigin-Name: 77abfe4126ef0adf7d0c70df7a2aac918bcc4128
This commit is contained in:
kostas
2015-04-30 12:15:14 +00:00
parent c59df3c7b0
commit 33d196fbdb
7 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fuel.pro
View File

@ -52,7 +52,7 @@ SOURCES += src/main.cpp\
src/LoggedProcess.cpp \
src/BrowserWidget.cpp \
src/CustomWebView.cpp \
src/Bridge.cpp \
src/Fossil.cpp \
src/Workspace.cpp
HEADERS += src/MainWindow.h \
@ -65,7 +65,7 @@ HEADERS += src/MainWindow.h \
src/LoggedProcess.h \
src/BrowserWidget.h \
src/CustomWebView.h \
src/Bridge.h \
src/Fossil.h \
src/Workspace.h
FORMS += ui/MainWindow.ui \

20
manifest
View File

@ -1,5 +1,5 @@
C Cosmetic\schanges
D 2015-04-30T12:00:47.495
C Renamed\sBridge\sto\sFossil
D 2015-04-30T12:15:14.026
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -15,7 +15,7 @@ F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
F doc/Building.txt 17b43fa23da764b5d1b828cc48c5a95e612bbd8f
F doc/Changes.txt b03302545e4a6c0b16a30d623a7627f8aef65ef6
F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
F fuel.pro 5db250757a6063a32663ab4813ec4d02912fa2f1
F fuel.pro cda04943d336bd186ab428a81310d442aec94ca2
F intl/convert.bat 4222ae403418381452b843929d15259ea9850ab1 x
F intl/convert.sh 2ca2179ff53e727f241925b75e19182607883c45 x
F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741
@ -184,8 +184,6 @@ F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b
F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038
F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
F rsrc/resources.qrc 4098be128fd6c045db933d041fe8844b14643a6f
F src/Bridge.cpp ec8e4c38ade150c41dcc8742d1322554979e8d03
F src/Bridge.h cc0d0128e2d286aa7d578d1213bed100ee4c458e
F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
F src/CloneDialog.cpp 4fc5aa8146ac63ba6ba7341b1635b3025819d708
@ -198,16 +196,18 @@ F src/FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8
F src/FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
F src/Fossil.cpp b54d136f05764535636da04bcc5f60b2eb97e5b6 w src/Bridge.cpp
F src/Fossil.h e46ec6cdb5c23a34176050fbd90e561ac87c07f9 w src/Bridge.h
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp f6ffb8c6d1283a812084094426d51a5ea601fa35
F src/MainWindow.h 4ce4e1cb3550ade8e41cbc5bcc465fdbcc13c342
F src/MainWindow.h 970c7e42d07499a86b1f6cc5cbe3921e1fc1f9e3
F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
F src/Utils.cpp f78728e0817b1db23007ba0d2c5c26980ee7ebca
F src/Utils.h 8ad68bd227bd999eb6ea92a70bb4be2d6788d912
F src/Workspace.cpp a1ca37e803d6bccb9ddf1f80df66148438e6ea21
F src/Workspace.h 515d6ded914dd8be10a611ebbb0e9befc8d64174
F src/Workspace.h 681e3b434455c21613022c95d182ccb35879fc68
F src/main.cpp 2ac8badc2a63fa123ceae53382ce24cfe1b5a54b
F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x
F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
@ -217,7 +217,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/MainWindow.ui 8677f5c8bca5bf7561d5f64bfdd0cef5157c6ac7
F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
P 717fb7a390f81af33ad40913960a30ff9c1c7a75
R 4149161be33e3e42f7c8fdad15ae0fe3
P c7b15ab434e33f5b73833256e97e2fabed8f1451
R ea2eae273fa42edf7d181d3dcc962763
U kostas
Z 44567a8ac9cdb0509589b8c3a26665fa
Z 9d3003eee2f50a485b1e0f3f2f9bf646

2
manifest.uuid
View File

@ -1 +1 @@
c7b15ab434e33f5b73833256e97e2fabed8f1451
77abfe4126ef0adf7d0c70df7a2aac918bcc4128

68
src/Bridge.cpp → src/Fossil.cpp
View File

@ -1,4 +1,4 @@
#include "Bridge.h"
#include "Fossil.h"
#include <QStringList>
#include <QCoreApplication>
#include <LoggedProcess.h>
@ -15,7 +15,7 @@ static const unsigned char UTF8_BOM[] = { 0xEF, 0xBB, 0xBF };
static const QRegExp REGEX_STASH("\\s*(\\d+):\\s+\\[(.*)\\] on (\\d+)-(\\d+)-(\\d+) (\\d+):(\\d+):(\\d+)", Qt::CaseInsensitive);
///////////////////////////////////////////////////////////////////////////////
RepoStatus Bridge::getRepoStatus()
RepoStatus Fossil::getRepoStatus()
{
QStringList res;
int exit_code = EXIT_FAILURE;
@ -57,7 +57,7 @@ RepoStatus Bridge::getRepoStatus()
}
//------------------------------------------------------------------------------
bool Bridge::openRepository(const QString& repositoryPath, const QString& workspacePath)
bool Fossil::openRepository(const QString& repositoryPath, const QString& workspacePath)
{
QFileInfo fi(repositoryPath);
@ -75,7 +75,7 @@ bool Bridge::openRepository(const QString& repositoryPath, const QString& worksp
}
//------------------------------------------------------------------------------
bool Bridge::newRepository(const QString& repositoryPath)
bool Fossil::newRepository(const QString& repositoryPath)
{
QFileInfo fi(repositoryPath);
@ -88,7 +88,7 @@ bool Bridge::newRepository(const QString& repositoryPath)
}
//------------------------------------------------------------------------------
bool Bridge::closeRepository()
bool Fossil::closeRepository()
{
if(!runFossil(QStringList() << "close"))
return false;
@ -99,25 +99,25 @@ bool Bridge::closeRepository()
}
//------------------------------------------------------------------------------
bool Bridge::listFiles(QStringList &files)
bool Fossil::listFiles(QStringList &files)
{
return runFossil(QStringList() << "ls" << "-l", &files, RUNFLAGS_SILENT_ALL);
}
//------------------------------------------------------------------------------
bool Bridge::pushRepository()
bool Fossil::pushRepository()
{
return runFossil(QStringList() << "push");
}
//------------------------------------------------------------------------------
bool Bridge::pullRepository()
bool Fossil::pullRepository()
{
return runFossil(QStringList() << "pull");
}
//------------------------------------------------------------------------------
bool Bridge::cloneRepository(const QString& repository, const QUrl& url, const QUrl& proxyUrl)
bool Fossil::cloneRepository(const QString& repository, const QUrl& url, const QUrl& proxyUrl)
{
// Actual command
QStringList cmd = QStringList() << "clone";
@ -151,7 +151,7 @@ bool Bridge::cloneRepository(const QString& repository, const QUrl& url, const Q
}
//------------------------------------------------------------------------------
bool Bridge::getFossilVersion(QString& version)
bool Fossil::getFossilVersion(QString& version)
{
QStringList res;
if(!runFossil(QStringList() << "version", &res, RUNFLAGS_SILENT_ALL) && res.length()==1)
@ -169,14 +169,14 @@ bool Bridge::getFossilVersion(QString& version)
}
//------------------------------------------------------------------------------
bool Bridge::diffFile(const QString &repoFile)
bool Fossil::diffFile(const QString &repoFile)
{
// Run the diff detached
return runFossil(QStringList() << "gdiff" << QuotePath(repoFile), 0, RUNFLAGS_DETACHED);
}
//------------------------------------------------------------------------------
bool Bridge::commitFiles(const QStringList& fileList, const QString& comment)
bool Fossil::commitFiles(const QStringList& fileList, const QString& comment)
{
// Do commit
QString comment_fname;
@ -210,7 +210,7 @@ bool Bridge::commitFiles(const QStringList& fileList, const QString& comment)
}
//------------------------------------------------------------------------------
bool Bridge::addFiles(const QStringList& fileList)
bool Fossil::addFiles(const QStringList& fileList)
{
if(fileList.empty())
return false;
@ -220,7 +220,7 @@ bool Bridge::addFiles(const QStringList& fileList)
}
//------------------------------------------------------------------------------
bool Bridge::removeFiles(const QStringList& fileList, bool deleteLocal)
bool Fossil::removeFiles(const QStringList& fileList, bool deleteLocal)
{
if(fileList.empty())
return false;
@ -243,7 +243,7 @@ bool Bridge::removeFiles(const QStringList& fileList, bool deleteLocal)
}
//------------------------------------------------------------------------------
bool Bridge::revertFiles(const QStringList& fileList)
bool Fossil::revertFiles(const QStringList& fileList)
{
if(fileList.empty())
return false;
@ -253,7 +253,7 @@ bool Bridge::revertFiles(const QStringList& fileList)
}
//------------------------------------------------------------------------------
bool Bridge::renameFile(const QString &beforePath, const QString &afterPath, bool renameLocal)
bool Fossil::renameFile(const QString &beforePath, const QString &afterPath, bool renameLocal)
{
// Ensure we can rename the file
if(!QFileInfo(beforePath).exists() || QFileInfo(afterPath).exists())
@ -273,7 +273,7 @@ bool Bridge::renameFile(const QString &beforePath, const QString &afterPath, boo
}
//------------------------------------------------------------------------------
bool Bridge::undoRepository(QStringList &result, bool explainOnly)
bool Fossil::undoRepository(QStringList &result, bool explainOnly)
{
QStringList params;
params << "undo";
@ -286,7 +286,7 @@ bool Bridge::undoRepository(QStringList &result, bool explainOnly)
}
//------------------------------------------------------------------------------
bool Bridge::updateRepository(QStringList &result, bool explainOnly)
bool Fossil::updateRepository(QStringList &result, bool explainOnly)
{
QStringList params;
params << "update";
@ -299,13 +299,13 @@ bool Bridge::updateRepository(QStringList &result, bool explainOnly)
}
//------------------------------------------------------------------------------
bool Bridge::getFossilSettings(QStringList &result)
bool Fossil::getFossilSettings(QStringList &result)
{
return runFossil(QStringList() << "settings", &result, RUNFLAGS_SILENT_ALL);
}
//------------------------------------------------------------------------------
bool Bridge::setFossilSetting(const QString& name, const QString& value, bool global)
bool Fossil::setFossilSetting(const QString& name, const QString& value, bool global)
{
QStringList params;
@ -321,7 +321,7 @@ bool Bridge::setFossilSetting(const QString& name, const QString& value, bool gl
}
//------------------------------------------------------------------------------
bool Bridge::setRemoteUrl(const QString& url)
bool Fossil::setRemoteUrl(const QString& url)
{
QString u = url;
@ -334,7 +334,7 @@ bool Bridge::setRemoteUrl(const QString& url)
}
//------------------------------------------------------------------------------
bool Bridge::getRemoteUrl(QString& url)
bool Fossil::getRemoteUrl(QString& url)
{
url.clear();
@ -348,7 +348,7 @@ bool Bridge::getRemoteUrl(QString& url)
}
//------------------------------------------------------------------------------
bool Bridge::stashNew(const QStringList& fileList, const QString& name, bool revert)
bool Fossil::stashNew(const QStringList& fileList, const QString& name, bool revert)
{
// Do Stash
// Snapshot just records the changes into the stash
@ -362,7 +362,7 @@ bool Bridge::stashNew(const QStringList& fileList, const QString& name, bool rev
}
//------------------------------------------------------------------------------
bool Bridge::stashList(stashmap_t& stashes)
bool Fossil::stashList(stashmap_t& stashes)
{
stashes.clear();
QStringList res;
@ -400,19 +400,19 @@ bool Bridge::stashList(stashmap_t& stashes)
}
//------------------------------------------------------------------------------
bool Bridge::stashApply(const QString& name)
bool Fossil::stashApply(const QString& name)
{
return runFossil(QStringList() << "stash" << "apply" << name);
}
//------------------------------------------------------------------------------
bool Bridge::stashDrop(const QString& name)
bool Fossil::stashDrop(const QString& name)
{
return runFossil(QStringList() << "stash" << "drop" << name);
}
//------------------------------------------------------------------------------
bool Bridge::stashDiff(const QString& name)
bool Fossil::stashDiff(const QString& name)
{
return runFossil(QStringList() << "stash" << "diff" << name, 0);
}
@ -433,7 +433,7 @@ static QString ParseFossilQuery(QString line)
}
//------------------------------------------------------------------------------
bool Bridge::runFossil(const QStringList &args, QStringList *output, int runFlags)
bool Fossil::runFossil(const QStringList &args, QStringList *output, int runFlags)
{
int exit_code = EXIT_FAILURE;
if(!runFossilRaw(args, output, &exit_code, runFlags))
@ -445,7 +445,7 @@ bool Bridge::runFossil(const QStringList &args, QStringList *output, int runFlag
//------------------------------------------------------------------------------
// Run fossil. Returns true if execution was successful regardless if fossil
// issued an error
bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exitCode, int runFlags)
bool Fossil::runFossilRaw(const QStringList &args, QStringList *output, int *exitCode, int runFlags)
{
bool silent_input = (runFlags & RUNFLAGS_SILENT_INPUT) != 0;
bool silent_output = (runFlags & RUNFLAGS_SILENT_OUTPUT) != 0;
@ -732,7 +732,7 @@ bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exi
}
//------------------------------------------------------------------------------
QString Bridge::getFossilPath()
QString Fossil::getFossilPath()
{
// Use the user-specified fossil if available
QString fossil_path = fossilPath;
@ -754,7 +754,7 @@ QString Bridge::getFossilPath()
}
//------------------------------------------------------------------------------
bool Bridge::isWorkspace(const QString &path)
bool Fossil::isWorkspace(const QString &path)
{
if(path.length()==0)
return false;
@ -769,13 +769,13 @@ bool Bridge::isWorkspace(const QString &path)
}
//------------------------------------------------------------------------------
bool Bridge::uiRunning() const
bool Fossil::uiRunning() const
{
return fossilUI.state() == QProcess::Running;
}
//------------------------------------------------------------------------------
bool Bridge::startUI(const QString &httpPort)
bool Fossil::startUI(const QString &httpPort)
{
if(uiRunning())
{
@ -805,7 +805,7 @@ bool Bridge::startUI(const QString &httpPort)
}
//------------------------------------------------------------------------------
void Bridge::stopUI()
void Fossil::stopUI()
{
if(uiRunning())
{

10
src/Bridge.h → src/Fossil.h
View File

@ -1,5 +1,5 @@
#ifndef BRIDGE_H
#define BRIDGE_H
#ifndef FOSSIL_H
#define FOSSIL_H
class QStringList;
#include <QString>
@ -27,10 +27,10 @@ enum RepoStatus
REPO_OLD_SCHEMA
};
class Bridge
class Fossil
{
public:
Bridge()
Fossil()
: operationAborted(false)
, uiCallback(0)
{
@ -129,4 +129,4 @@ private:
};
#endif // BRIDGE_H
#endif // FOSSIL_H

4
src/MainWindow.h
View File

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

8
src/Workspace.h
View File

@ -6,7 +6,7 @@
#include <QDir>
#include <QSet>
#include <QMap>
#include "Bridge.h"
#include "Fossil.h"
//////////////////////////////////////////////////////////////////////////
// WorkspaceFile
@ -107,8 +107,8 @@ public:
void clearState();
Bridge & fossil() { return bridge; }
const Bridge & fossil() const { return bridge; }
Fossil & fossil() { return bridge; }
const Fossil & fossil() const { return bridge; }
static bool scanDirectory(QFileInfoList &entries, const QString& dirPath, const QString &baseDir, const QString ignoreSpec, const bool& abort, UICallback &uiCallback);
void scanWorkspace(bool scanLocal, bool scanIgnored, bool scanModified, bool scanUnchanged, const QString &ignoreGlob, UICallback &uiCallback, bool &operationAborted);
@ -121,7 +121,7 @@ public:
stashmap_t &getStashes() { return stashMap; }
private:
Bridge bridge;
Fossil bridge;
filemap_t workspaceFiles;
stringset_t pathSet;
stashmap_t stashMap;