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

ClearCase: Fix Check-In for external files

Browse Source 
Change-Id: Ic1edf63e7fe1667e7e3b59a610ba77bfe6308a2c
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-09-12 09:27:06 +03:00
committed by Orgad Shaneh
parent 3a044b1ec8
commit 80502c610f
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -201,6 +201,7 @@ void ClearCasePlugin::cleanCheckInMessageFile()
if (!m_checkInMessageFileName.isEmpty()) { if (!m_checkInMessageFileName.isEmpty()) {
QFile::remove(m_checkInMessageFileName); QFile::remove(m_checkInMessageFileName);
m_checkInMessageFileName.clear(); m_checkInMessageFileName.clear();
m_checkInView.clear();
} }
} }
@@ -495,7 +496,7 @@ bool ClearCasePlugin::submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *sub
void ClearCasePlugin::diffCheckInFiles(const QStringList &files) void ClearCasePlugin::diffCheckInFiles(const QStringList &files)
{ {
ccDiffWithPred(files); ccDiffWithPred(m_checkInView, files);
} }
static inline void setDiffBaseDirectory(Core::IEditor *editor, const QString &db) static inline void setDiffBaseDirectory(Core::IEditor *editor, const QString &db)
@@ -562,7 +563,7 @@ ClearCaseSubmitEditor *ClearCasePlugin::openClearCaseSubmitEditor(const QString
QTC_CHECK(submitEditor); QTC_CHECK(submitEditor);
submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_checkInSelectedAction, m_checkInDiffAction); submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_checkInSelectedAction, m_checkInDiffAction);
connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCheckInFiles(QStringList))); connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCheckInFiles(QStringList)));
submitEditor->setCheckScriptWorkingDirectory(currentState().topLevel()); submitEditor->setCheckScriptWorkingDirectory(m_checkInView);
return submitEditor; return submitEditor;
} }
@@ -738,18 +739,17 @@ QString ClearCasePlugin::ccGetFileVersion(const QString &workingDir, const QStri
return runCleartoolSync(workingDir, args).trimmed(); return runCleartoolSync(workingDir, args).trimmed();
} }
void ClearCasePlugin::ccDiffWithPred(const QStringList &files) void ClearCasePlugin::ccDiffWithPred(const QString &workingDir, const QStringList &files)
{ {
if (ClearCase::Constants::debug) if (ClearCase::Constants::debug)
qDebug() << Q_FUNC_INFO << files; qDebug() << Q_FUNC_INFO << files;
QString topLevel = currentState().topLevel(); const QString source = VcsBase::VcsBaseEditorWidget::getSource(workingDir, files);
const QString source = VcsBase::VcsBaseEditorWidget::getSource(topLevel, files);
QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(0) : VcsBase::VcsBaseEditorWidget::getCodec(source); QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(0) : VcsBase::VcsBaseEditorWidget::getCodec(source);
if ((m_settings.diffType == GraphicalDiff) && (files.count() == 1)) { if ((m_settings.diffType == GraphicalDiff) && (files.count() == 1)) {
QString file = files.first(); QString file = files.first();
if (m_statusMap->value(file).status == FileStatus::Hijacked) if (m_statusMap->value(file).status == FileStatus::Hijacked)
diffGraphical(ccGetFileVersion(topLevel, file), file); diffGraphical(ccGetFileVersion(workingDir, file), file);
else else
diffGraphical(file); diffGraphical(file);
return; // done here, diff is opened in a new window return; // done here, diff is opened in a new window
@@ -762,7 +762,7 @@ void ClearCasePlugin::ccDiffWithPred(const QStringList &files)
QString result; QString result;
foreach (const QString &file, files) { foreach (const QString &file, files) {
if (m_statusMap->value(QDir::fromNativeSeparators(file)).status == FileStatus::Hijacked) if (m_statusMap->value(QDir::fromNativeSeparators(file)).status == FileStatus::Hijacked)
result += diffExternal(ccGetFileVersion(topLevel, file), file); result += diffExternal(ccGetFileVersion(workingDir, file), file);
else else
result += diffExternal(file); result += diffExternal(file);
} }
@@ -771,20 +771,20 @@ void ClearCasePlugin::ccDiffWithPred(const QStringList &files)
// diff of a single file? re-use an existing view if possible to support // diff of a single file? re-use an existing view if possible to support
// the common usage pattern of continuously changing and diffing a file // the common usage pattern of continuously changing and diffing a file
const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::DiffOutput, topLevel, files); const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::DiffOutput, workingDir, files);
if (files.count() == 1) { if (files.count() == 1) {
// Show in the same editor if diff has been executed before // Show in the same editor if diff has been executed before
if (Core::IEditor *existingEditor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) { if (Core::IEditor *existingEditor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) {
existingEditor->createNew(result); existingEditor->createNew(result);
Core::EditorManager::activateEditor(existingEditor, Core::EditorManager::ModeSwitch); Core::EditorManager::activateEditor(existingEditor, Core::EditorManager::ModeSwitch);
setDiffBaseDirectory(existingEditor, topLevel); setDiffBaseDirectory(existingEditor, workingDir);
return; return;
} }
diffname = QDir::toNativeSeparators(files.first()); diffname = QDir::toNativeSeparators(files.first());
} }
const QString title = QString::fromLatin1("cc diff %1").arg(diffname); const QString title = QString::fromLatin1("cc diff %1").arg(diffname);
Core::IEditor *editor = showOutputInEditor(title, result, VcsBase::DiffOutput, source, codec); Core::IEditor *editor = showOutputInEditor(title, result, VcsBase::DiffOutput, source, codec);
setDiffBaseDirectory(editor, topLevel); setDiffBaseDirectory(editor, workingDir);
VcsBase::VcsBaseEditorWidget::tagEditor(editor, tag); VcsBase::VcsBaseEditorWidget::tagEditor(editor, tag);
ClearCaseEditor *diffEditorWidget = qobject_cast<ClearCaseEditor *>(editor->widget()); ClearCaseEditor *diffEditorWidget = qobject_cast<ClearCaseEditor *>(editor->widget());
QTC_ASSERT(diffEditorWidget, return); QTC_ASSERT(diffEditorWidget, return);
@@ -884,7 +884,7 @@ void ClearCasePlugin::diffCurrentFile()
{ {
const VcsBase::VcsBasePluginState state = currentState(); const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return); QTC_ASSERT(state.hasFile(), return);
ccDiffWithPred(QStringList(state.relativeCurrentFile())); ccDiffWithPred(state.topLevel(), QStringList(state.relativeCurrentFile()));
} }
void ClearCasePlugin::startCheckInCurrentFile() void ClearCasePlugin::startCheckInCurrentFile()
@@ -974,6 +974,7 @@ void ClearCasePlugin::startCheckIn(const QString &workingDir, const QStringList
return; return;
} }
m_checkInMessageFileName = saver.fileName(); m_checkInMessageFileName = saver.fileName();
m_checkInView = workingDir;
// Create a submit editor and set file list // Create a submit editor and set file list
ClearCaseSubmitEditor *editor = openClearCaseSubmitEditor(m_checkInMessageFileName); ClearCaseSubmitEditor *editor = openClearCaseSubmitEditor(m_checkInMessageFileName);
editor->setStatusList(files); editor->setStatusList(files);
@@ -1373,10 +1374,9 @@ bool ClearCasePlugin::vcsCheckIn(const QString &messageFile, const QStringList &
if (files.isEmpty()) if (files.isEmpty())
return true; return true;
const QString title = QString::fromLatin1("Checkin %1").arg(files.join(QLatin1String("; "))); const QString title = QString::fromLatin1("Checkin %1").arg(files.join(QLatin1String("; ")));
QString workingDir = currentState().topLevel();
typedef QSharedPointer<Core::FileChangeBlocker> FCBPointer; typedef QSharedPointer<Core::FileChangeBlocker> FCBPointer;
replaceActivity &= (activity != QLatin1String(Constants::KEEP_ACTIVITY)); replaceActivity &= (activity != QLatin1String(Constants::KEEP_ACTIVITY));
if (replaceActivity && !vcsSetActivity(workingDir, title, activity)) if (replaceActivity && !vcsSetActivity(m_checkInView, title, activity))
return false; return false;
QFile msgFile(messageFile); QFile msgFile(messageFile);
msgFile.open(QFile::ReadOnly | QFile::Text); msgFile.open(QFile::ReadOnly | QFile::Text);
@@ -1395,11 +1395,11 @@ bool ClearCasePlugin::vcsCheckIn(const QString &messageFile, const QStringList &
args << files; args << files;
QList<FCBPointer> blockers; QList<FCBPointer> blockers;
foreach (QString fileName, files) { foreach (QString fileName, files) {
FCBPointer fcb(new Core::FileChangeBlocker(QFileInfo(workingDir, fileName).canonicalFilePath())); FCBPointer fcb(new Core::FileChangeBlocker(QFileInfo(m_checkInView, fileName).canonicalFilePath()));
blockers.append(fcb); blockers.append(fcb);
} }
const ClearCaseResponse response = const ClearCaseResponse response =
runCleartool(workingDir, args, m_settings.longTimeOutMS(), ShowStdOutInLogWindow); runCleartool(m_checkInView, args, m_settings.longTimeOutMS(), ShowStdOutInLogWindow);
QRegExp checkedIn(QLatin1String("Checked in \\\"([^\"]*)\\\"")); QRegExp checkedIn(QLatin1String("Checked in \\\"([^\"]*)\\\""));
bool anySucceeded = false; bool anySucceeded = false;
int offset = checkedIn.indexIn(response.stdOut); int offset = checkedIn.indexIn(response.stdOut);

3
src/plugins/clearcase/clearcaseplugin.h
View File

@@ -203,7 +203,7 @@ private:
bool enableAnnotationContextMenu = false); bool enableAnnotationContextMenu = false);
QString ccGetFileVersion(const QString &workingDir, const QString &file) const; QString ccGetFileVersion(const QString &workingDir, const QString &file) const;
void ccUpdate(const QString &workingDir, const QStringList &relativePaths = QStringList()); void ccUpdate(const QString &workingDir, const QStringList &relativePaths = QStringList());
void ccDiffWithPred(const QStringList &files); void ccDiffWithPred(const QString &workingDir, const QStringList &files);
void startCheckIn(const QString &workingDir, const QStringList &files = QStringList()); void startCheckIn(const QString &workingDir, const QStringList &files = QStringList());
void cleanCheckInMessageFile(); void cleanCheckInMessageFile();
inline ClearCaseControl *clearCaseControl() const; inline ClearCaseControl *clearCaseControl() const;
@@ -221,6 +221,7 @@ private:
ClearCaseSettings m_settings; ClearCaseSettings m_settings;
QString m_checkInMessageFileName; QString m_checkInMessageFileName;
QString m_checkInView;
QString m_topLevel; QString m_topLevel;
QString m_stream; QString m_stream;
QString m_view; QString m_view;