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

VCS: Do not try to add files that are already tracked

Browse Source 
Task-number: QTCREATORBUG-2455
Change-Id: I4b1fa9676ad4a8d7293e035e4d6103251bef8aee
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-10-02 00:18:39 +03:00
committed by Orgad Shaneh
parent 6f24665e7e
commit fdb6ef90fc
32 changed files with 140 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cvs/cvsplugin.h
View File

@@ -90,6 +90,7 @@ public:
bool vcsAdd(const QString &workingDir, const QString &fileName);
bool vcsDelete(const QString &workingDir, const QString &fileName);
bool managesDirectory(const QString &directory, QString *topLevel = 0) const;
bool managesFile(const QString &workingDirectory, const QString &fileName) const;
// cvs 'edit' is used to implement 'open' (cvsnt).
bool edit(const QString &topLevel, const QStringList &files);
@@ -143,7 +144,8 @@ private:
CvsResponse runCvs(const QString &workingDirectory,
const QStringList &arguments,
int timeOut,
unsigned flags, QTextCodec *outputCodec = 0);
unsigned flags,
QTextCodec *outputCodec = 0) const;
void annotate(const QString &workingDir, const QString &file,
const QString &revision = QString(), int lineNumber= -1);