forked from qt-creator/qt-creator
Version control: Do not keep lock on message file while committing.
Store the file name and do not keep the QTemporaryFile around, which still seems to maintain some kind of lock on Windows although it is closed.
This commit is contained in:
@@ -39,7 +39,6 @@
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QDir;
|
||||
class QAction;
|
||||
class QTemporaryFile;
|
||||
class QTextCodec;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
@@ -124,6 +123,7 @@ private slots:
|
||||
void diffFiles(const QStringList &);
|
||||
|
||||
private:
|
||||
bool isCommitEditorOpen() const;
|
||||
QString currentFileName() const;
|
||||
Core::IEditor * showOutputInEditor(const QString& title, const QString &output,
|
||||
int editorType, const QString &source,
|
||||
@@ -149,11 +149,11 @@ private:
|
||||
QStringList currentProjectsTopLevels(QString *name = 0) const;
|
||||
void startCommit(const QString &file);
|
||||
bool commit(const QString &messageFile, const QStringList &subVersionFileList);
|
||||
void cleanChangeTmpFile();
|
||||
void cleanCommitMessageFile();
|
||||
|
||||
CVSSettings m_settings;
|
||||
Core::IVersionControl *m_versionControl;
|
||||
QTemporaryFile *m_changeTmpFile;
|
||||
QString m_commitMessageFileName;
|
||||
|
||||
ProjectExplorer::ProjectExplorerPlugin *m_projectExplorer;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user