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

ClearCase: Hijacked files are only relevant for snapshot views

Browse Source 
Change-Id: I92959a83e74aceb693678fa74dc2bcdde83ad8d3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Knut Petter Svendsen
2012-09-17 22:53:51 +02:00
committed by Orgad Shaneh
parent 778e6675e1
commit 8676b58fb4
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,7 @@ ClearCasePlugin *ClearCasePlugin::m_clearcasePluginInstance = 0;
ClearCasePlugin::ClearCasePlugin() : ClearCasePlugin::ClearCasePlugin() :
VcsBase::VcsBasePlugin(QLatin1String(ClearCase::Constants::CLEARCASECHECKINEDITOR_ID)), VcsBase::VcsBasePlugin(QLatin1String(ClearCase::Constants::CLEARCASECHECKINEDITOR_ID)),
m_isDynamic(false),
m_commandLocator(0), m_commandLocator(0),
m_checkOutAction(0), m_checkOutAction(0),
m_checkInCurrentAction(0), m_checkInCurrentAction(0),
@@ -581,7 +582,7 @@ void ClearCasePlugin::updateStatusActions()
FileStatus fileStatus = m_statusMap->value(currentState().relativeCurrentFile(), FileStatus(FileStatus::Unknown)); FileStatus fileStatus = m_statusMap->value(currentState().relativeCurrentFile(), FileStatus(FileStatus::Unknown));
m_checkOutAction->setEnabled(hasFile && (fileStatus.status & (FileStatus::CheckedIn | FileStatus::Hijacked))); m_checkOutAction->setEnabled(hasFile && (fileStatus.status & (FileStatus::CheckedIn | FileStatus::Hijacked)));
m_undoCheckOutAction->setEnabled(hasFile && (fileStatus.status & FileStatus::CheckedOut)); m_undoCheckOutAction->setEnabled(hasFile && (fileStatus.status & FileStatus::CheckedOut));
m_undoHijackAction->setEnabled(hasFile && (fileStatus.status & FileStatus::Hijacked)); m_undoHijackAction->setEnabled(!m_isDynamic && hasFile && (fileStatus.status & FileStatus::Hijacked));
m_checkInCurrentAction->setEnabled(hasFile && (fileStatus.status & FileStatus::CheckedOut)); m_checkInCurrentAction->setEnabled(hasFile && (fileStatus.status & FileStatus::CheckedOut));
m_addFileAction->setEnabled(hasFile && (fileStatus.status & FileStatus::NotManaged)); m_addFileAction->setEnabled(hasFile && (fileStatus.status & FileStatus::NotManaged));
} }
@@ -598,7 +599,7 @@ void ClearCasePlugin::updateActions(VcsBase::VcsBasePlugin::ActionState as)
if (hasTopLevel) if (hasTopLevel)
m_topLevel = state.topLevel(); m_topLevel = state.topLevel();
m_updateViewAction->setParameter(m_view); m_updateViewAction->setParameter(m_isDynamic ? QString() : m_view);
const QString fileName = state.currentFileName(); const QString fileName = state.currentFileName();
m_checkOutAction->setParameter(fileName); m_checkOutAction->setParameter(fileName);
@@ -1304,7 +1305,8 @@ bool ClearCasePlugin::vcsOpen(const QString &workingDir, const QString &fileName
QMessageBox::information(0, tr("ClearCase Checkout"), tr("File is already checked out.")); QMessageBox::information(0, tr("ClearCase Checkout"), tr("File is already checked out."));
return true; return true;
} }
bool isHijacked = (m_statusMap->value(relFile).status & FileStatus::Hijacked); // Only snapshot views can have hijacked files
bool isHijacked = (!m_isDynamic && (m_statusMap->value(relFile).status & FileStatus::Hijacked));
if (!isHijacked) if (!isHijacked)
coDialog.hideHijack(); coDialog.hideHijack();
if (coDialog.exec() == QDialog::Accepted) { if (coDialog.exec() == QDialog::Accepted) {
@@ -1325,6 +1327,14 @@ bool ClearCasePlugin::vcsOpen(const QString &workingDir, const QString &fileName
if (coDialog.isPreserveTime()) if (coDialog.isPreserveTime())
args << QLatin1String("-ptime"); args << QLatin1String("-ptime");
if (isHijacked) { if (isHijacked) {
if (ClearCase::Constants::debug)
qDebug() << Q_FUNC_INFO << file << " seems to be hijacked";
// A hijacked files means that the file is modified but was
// not checked out. By checking it out now changes will
// be lost, unless handled. This can be done by renaming
// the hijacked file, undoing the hijack and updating the file
// -usehijack not supported in old cleartool versions... // -usehijack not supported in old cleartool versions...
// args << QLatin1String("-usehijack"); // args << QLatin1String("-usehijack");
if (coDialog.isUseHijacked()) if (coDialog.isUseHijacked())
@@ -1553,7 +1563,7 @@ QString ClearCasePlugin::vcsGetRepositoryURL(const QString & /*directory*/)
return currentState().topLevel(); return currentState().topLevel();
} }
// ClearCase has "view.dat" file in the root directory it manages. // ClearCase has "view.dat" file in the root directory it manages for snapshot views.
bool ClearCasePlugin::managesDirectory(const QString &directory, QString *topLevel /* = 0 */) const bool ClearCasePlugin::managesDirectory(const QString &directory, QString *topLevel /* = 0 */) const
{ {
QString topLevelFound = findTopLevel(directory); QString topLevelFound = findTopLevel(directory);
@@ -1685,8 +1695,8 @@ void ClearCasePlugin::updateStreamAndView()
QRegExp intStreamExp(QLatin1String("stream:([^@]*)")); QRegExp intStreamExp(QLatin1String("stream:([^@]*)"));
if (intStreamExp.indexIn(sresponse.mid(tabPos + 1)) != -1) if (intStreamExp.indexIn(sresponse.mid(tabPos + 1)) != -1)
m_intStream = intStreamExp.cap(1); m_intStream = intStreamExp.cap(1);
m_view = ccGetView(m_topLevel); m_view = ccGetView(m_topLevel, &m_isDynamic);
m_updateViewAction->setParameter(m_view); m_updateViewAction->setParameter(m_isDynamic ? QString() : m_view);
} }
void ClearCasePlugin::projectChanged(ProjectExplorer::Project *project) void ClearCasePlugin::projectChanged(ProjectExplorer::Project *project)

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

@@ -225,6 +225,7 @@ private:
QString m_topLevel; QString m_topLevel;
QString m_stream; QString m_stream;
QString m_view; QString m_view;
bool m_isDynamic;
QString m_intStream; QString m_intStream;
QString m_activity; QString m_activity;
QString m_diffPrefix; QString m_diffPrefix;