forked from qt-creator/qt-creator
Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
190 lines
5.4 KiB
C++
190 lines
5.4 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2015 The Qt Company Ltd.
|
|
** Contact: http://www.qt.io/licensing
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms and
|
|
** conditions see http://www.qt.io/terms-conditions. For further information
|
|
** use the contact form at http://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
** following information to ensure the GNU Lesser General Public License
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, The Qt Company gives you certain additional
|
|
** rights. These rights are described in The Qt Company LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "gitversioncontrol.h"
|
|
#include "gitclient.h"
|
|
#include "gitutils.h"
|
|
|
|
#include <vcsbase/vcsbaseconstants.h>
|
|
|
|
#include <QFileInfo>
|
|
|
|
namespace Git {
|
|
namespace Internal {
|
|
|
|
class GitTopicCache : public Core::IVersionControl::TopicCache
|
|
{
|
|
public:
|
|
GitTopicCache(GitClient *client) :
|
|
m_client(client)
|
|
{
|
|
}
|
|
|
|
protected:
|
|
QString trackFile(const QString &repository)
|
|
{
|
|
const QString gitDir = m_client->findGitDirForRepository(repository);
|
|
return gitDir.isEmpty() ? QString() : (gitDir + QLatin1String("/HEAD"));
|
|
}
|
|
|
|
QString refreshTopic(const QString &repository)
|
|
{
|
|
return m_client->synchronousTopic(repository);
|
|
}
|
|
|
|
private:
|
|
GitClient *m_client;
|
|
};
|
|
|
|
GitVersionControl::GitVersionControl(GitClient *client) :
|
|
Core::IVersionControl(new GitTopicCache(client)),
|
|
m_client(client)
|
|
{
|
|
}
|
|
|
|
QString GitVersionControl::displayName() const
|
|
{
|
|
return QLatin1String("Git");
|
|
}
|
|
|
|
Core::Id GitVersionControl::id() const
|
|
{
|
|
return Core::Id(VcsBase::Constants::VCS_ID_GIT);
|
|
}
|
|
|
|
bool GitVersionControl::isConfigured() const
|
|
{
|
|
bool ok = false;
|
|
m_client->gitExecutable(&ok);
|
|
return ok;
|
|
}
|
|
|
|
bool GitVersionControl::supportsOperation(Operation operation) const
|
|
{
|
|
if (!isConfigured())
|
|
return false;
|
|
|
|
switch (operation) {
|
|
case AddOperation:
|
|
case DeleteOperation:
|
|
case MoveOperation:
|
|
case CreateRepositoryOperation:
|
|
case SnapshotOperations:
|
|
case AnnotateOperation:
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool GitVersionControl::vcsOpen(const QString & /*fileName*/)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool GitVersionControl::vcsAdd(const QString & fileName)
|
|
{
|
|
const QFileInfo fi(fileName);
|
|
return m_client->synchronousAdd(fi.absolutePath(), QStringList(fi.fileName()));
|
|
}
|
|
|
|
bool GitVersionControl::vcsDelete(const QString & fileName)
|
|
{
|
|
const QFileInfo fi(fileName);
|
|
return m_client->synchronousDelete(fi.absolutePath(), true, QStringList(fi.fileName()));
|
|
}
|
|
|
|
bool GitVersionControl::vcsMove(const QString &from, const QString &to)
|
|
{
|
|
const QFileInfo fromInfo(from);
|
|
const QFileInfo toInfo(to);
|
|
return m_client->synchronousMove(fromInfo.absolutePath(), fromInfo.absoluteFilePath(), toInfo.absoluteFilePath());
|
|
}
|
|
|
|
bool GitVersionControl::vcsCreateRepository(const QString &directory)
|
|
{
|
|
return m_client->synchronousInit(directory);
|
|
}
|
|
|
|
QString GitVersionControl::vcsTopic(const QString &directory)
|
|
{
|
|
QString topic = Core::IVersionControl::vcsTopic(directory);
|
|
const QString commandInProgress = m_client->commandInProgressDescription(directory);
|
|
if (!commandInProgress.isEmpty())
|
|
topic += QLatin1String(" (") + commandInProgress + QLatin1Char(')');
|
|
return topic;
|
|
}
|
|
|
|
QStringList GitVersionControl::additionalToolsPath() const
|
|
{
|
|
QStringList res = m_client->settings()->searchPathList();
|
|
const QString binaryPath = m_client->gitBinDirectory().toString();
|
|
if (!binaryPath.isEmpty() && !res.contains(binaryPath))
|
|
res << binaryPath;
|
|
return res;
|
|
}
|
|
|
|
bool GitVersionControl::managesDirectory(const QString &directory, QString *topLevel) const
|
|
{
|
|
const QString topLevelFound = m_client->findRepositoryForDirectory(directory);
|
|
if (topLevel)
|
|
*topLevel = topLevelFound;
|
|
return !topLevelFound.isEmpty();
|
|
}
|
|
|
|
bool GitVersionControl::managesFile(const QString &workingDirectory, const QString &fileName) const
|
|
{
|
|
return m_client->managesFile(workingDirectory, fileName);
|
|
}
|
|
|
|
bool GitVersionControl::vcsAnnotate(const QString &file, int line)
|
|
{
|
|
const QFileInfo fi(file);
|
|
m_client->blame(fi.absolutePath(), QStringList(), fi.fileName(), QString(), line);
|
|
return true;
|
|
}
|
|
|
|
void GitVersionControl::emitFilesChanged(const QStringList &l)
|
|
{
|
|
emit filesChanged(l);
|
|
}
|
|
|
|
void GitVersionControl::emitRepositoryChanged(const QString &r)
|
|
{
|
|
emit repositoryChanged(r);
|
|
}
|
|
|
|
void GitVersionControl::emitConfigurationChanged()
|
|
{
|
|
emit configurationChanged();
|
|
}
|
|
|
|
} // Internal
|
|
} // Git
|