Wrapped fossil version
FossilOrigin-Name: 239b8ac44d4dd954633b52d28b68e4cd9937efbc
This commit is contained in:
@ -155,6 +155,24 @@ bool Bridge::cloneRepository(const QString& repository, const QUrl& url, const Q
|
||||
return true;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
bool Bridge::getFossilVersion(QString& version)
|
||||
{
|
||||
QStringList res;
|
||||
if(!runFossil(QStringList() << "version", &res, RUNFLAGS_SILENT_ALL) && res.length()==1)
|
||||
return false;
|
||||
|
||||
if(res.length()==0)
|
||||
return false;
|
||||
|
||||
int off = res[0].indexOf("version ");
|
||||
if(off==-1)
|
||||
return false;
|
||||
|
||||
version = res[0].mid(off+8);
|
||||
return true;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
bool Bridge::diffFile(const QString &repoFile)
|
||||
{
|
||||
|
@ -90,6 +90,8 @@ public:
|
||||
bool pullRepository();
|
||||
bool cloneRepository(const QString &repository, const QUrl &url, const QUrl &proxyUrl);
|
||||
|
||||
bool getFossilVersion(QString &version);
|
||||
|
||||
bool uiRunning() const;
|
||||
bool startUI(const QString &httpPort);
|
||||
void stopUI();
|
||||
|
@ -2223,14 +2223,19 @@ void MainWindow::on_actionUndo_triggered()
|
||||
void MainWindow::on_actionAbout_triggered()
|
||||
{
|
||||
QString fossil_ver;
|
||||
QStringList res;
|
||||
|
||||
#ifndef BRIDGE_ENABLED
|
||||
QStringList res;
|
||||
if(runFossil(QStringList() << "version", &res, RUNFLAGS_SILENT_ALL) && res.length()==1)
|
||||
{
|
||||
int off = res[0].indexOf("version ");
|
||||
if(off!=-1)
|
||||
fossil_ver = tr("Fossil version %0").arg(res[0].mid(off+8)) + "\n";
|
||||
}
|
||||
#else
|
||||
if(bridge.getFossilVersion(fossil_ver))
|
||||
fossil_ver = tr("Fossil version %0").arg(fossil_ver) + "\n";
|
||||
#endif
|
||||
|
||||
QString qt_ver = tr("QT version %0").arg(QT_VERSION_STR) + "\n\n";
|
||||
|
||||
|
Reference in New Issue
Block a user