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

VCS [git]: Annotate previous version/single filelog annotation.

Browse Source 
Task-number: QTCREATORBUG-503
This commit is contained in:
Friedemann Kleint
2010-01-07 17:29:14 +01:00
parent 322ef6b83a
commit bcba9ea604
5 changed files with 195 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/git/gitclient.h
View File

@@ -79,8 +79,10 @@ public:
const QStringList &unstagedFileNames, const QStringList &stagedFileNames= QStringList());
void status(const QString &workingDirectory);
void log(const QString &workingDirectory, const QStringList &fileNames);
void blame(const QString &workingDirectory, const QString &fileName, int lineNumber = -1);
void log(const QString &workingDirectory, const QStringList &fileNames,
bool enableAnnotationContextMenu = false);
void blame(const QString &workingDirectory, const QString &fileName,
const QString &revision = QString(), int lineNumber = -1);
void showCommit(const QString &workingDirectory, const QString &commit);
void checkout(const QString &workingDirectory, const QString &file);
void checkoutBranch(const QString &workingDirectory, const QString &branch);
@@ -95,6 +97,17 @@ public:
QString *output, QString *errorMessage);
bool synchronousShow(const QString &workingDirectory, const QString &id,
QString *output, QString *errorMessage);
bool synchronousParentRevisions(const QString &workingDirectory,
const QStringList &files /* = QStringList() */,
const QString &revision,
QStringList *parents,
QString *errorMessage);
bool synchronousShortDescription(const QString &workingDirectory, const QString &revision,
QString *description, QString *errorMessage);
bool synchronousShortDescription(const QString &workingDirectory, const QString &revision,
const QString &format, QString *description, QString *errorMessage);
bool synchronousShortDescriptions(const QString &workingDirectory, const QStringList &revisions,
QStringList *descriptions, QString *errorMessage);
void pull(const QString &workingDirectory);
void push(const QString &workingDirectory);
@@ -145,6 +158,9 @@ public:
public slots:
void show(const QString &source, const QString &id);
private slots:
void slotBlameRevisionRequested(const QString &source, QString change, int lineNumber);
private:
VCSBase::VCSBaseEditor *createVCSEditor(const QString &kind,
QString title,