feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Replace old svn diff editor with the new one

Browse Source 
Change-Id: I4137b709be718603cdc221ac938e139326c88835
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2014-11-06 13:23:40 +01:00
committed by Jarek Kobus
parent 07e3a032ff
commit 8d1940a796
12 changed files with 347 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/subversion/subversionclient.h
View File

@@ -41,6 +41,7 @@ namespace Subversion {
namespace Internal {
class SubversionSettings;
class SubversionDiffEditorReloader;
class SubversionClient : public VcsBase::VcsBaseClient
{
@@ -60,8 +61,8 @@ public:
const QString &commitMessageFile,
const QStringList &extraOptions = QStringList());
void diff(const QString &workingDir, const QStringList &files,
const QStringList &extraOptions = QStringList());
void diff(const QString &workingDirectory, const QStringList &files);
void describe(const QString &workingDirectory, int changeNumber, const QString &title);
QString findTopLevelForFile(const QFileInfo &file) const;
QStringList revisionSpec(const QString &revision) const;
StatusItem parseStatusLine(const QString &line) const;
@@ -73,12 +74,15 @@ public:
protected:
Core::Id vcsEditorKind(VcsCommandTag cmd) const;
VcsBase::VcsBaseEditorParameterWidget *createDiffEditor(const QString &workingDir,
const QStringList &files,
const QStringList &extraOptions);
private:
Utils::FileName m_svnVersionBinary;
QString m_svnVersion;
SubversionDiffEditorReloader *findOrCreateDiffEditor(const QString &documentId,
const QString &source,
const QString &title,
const QString &workingDirectory) const;
mutable Utils::FileName m_svnVersionBinary;
mutable QString m_svnVersion;
};
} // namespace Internal