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

ClearCase: Use check out comment on check in

Browse Source 
Task-number: QTCREATORBUG-12846
Change-Id: I02b3d713df8cc0e28d1bd32a401f692460c5fdbd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-09-15 13:06:13 +03:00
committed by Orgad Shaneh
parent c69e4f27cb
commit 0188b74a65
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1244,8 +1244,9 @@ void ClearCasePlugin::startCheckIn(const QString &workingDir, const QStringList
// Create a new submit change file containing the submit template // Create a new submit change file containing the submit template
TempFileSaver saver; TempFileSaver saver;
saver.setAutoRemove(false); saver.setAutoRemove(false);
// TODO: Retrieve submit template from QString submitTemplate;
const QString submitTemplate; if (files.count() == 1)
submitTemplate = ccGetComment(workingDir, files.first());
// Create a submit // Create a submit
saver.write(submitTemplate.toUtf8()); saver.write(submitTemplate.toUtf8());
if (!saver.finalize()) { if (!saver.finalize()) {
@@ -1992,6 +1993,13 @@ ViewData ClearCasePlugin::ccGetView(const QString &workingDir) const
return res; return res;
} }
QString ClearCasePlugin::ccGetComment(const QString &workingDir, const QString &fileName) const
{
QStringList args(QLatin1String("describe"));
args << QLatin1String("-fmt") << QLatin1String("%c") << fileName;
return runCleartoolSync(workingDir, args);
}
void ClearCasePlugin::updateStreamAndView() void ClearCasePlugin::updateStreamAndView()
{ {
QStringList args(QLatin1String("lsstream")); QStringList args(QLatin1String("lsstream"));

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

@@ -152,6 +152,7 @@ public:
QString ccGetPredecessor(const QString &version) const; QString ccGetPredecessor(const QString &version) const;
QStringList ccGetActiveVobs() const; QStringList ccGetActiveVobs() const;
ViewData ccGetView(const QString &workingDir) const; ViewData ccGetView(const QString &workingDir) const;
QString ccGetComment(const QString &workingDir, const QString &fileName) const;
bool ccFileOp(const QString &workingDir, const QString &title, const QStringList &args, bool ccFileOp(const QString &workingDir, const QString &title, const QStringList &args,
const QString &fileName, const QString &file2 = QString()); const QString &fileName, const QString &file2 = QString());
FileStatus vcsStatus(const QString &file) const; FileStatus vcsStatus(const QString &file) const;