From 0188b74a65690bcd04c6886ba0bfdfd98b17390c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 15 Sep 2014 13:06:13 +0300 Subject: [PATCH] ClearCase: Use check out comment on check in Task-number: QTCREATORBUG-12846 Change-Id: I02b3d713df8cc0e28d1bd32a401f692460c5fdbd Reviewed-by: Tobias Hunger --- src/plugins/clearcase/clearcaseplugin.cpp | 12 ++++++++++-- src/plugins/clearcase/clearcaseplugin.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 91595985437..bb1d223dd82 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -1244,8 +1244,9 @@ void ClearCasePlugin::startCheckIn(const QString &workingDir, const QStringList // Create a new submit change file containing the submit template TempFileSaver saver; saver.setAutoRemove(false); - // TODO: Retrieve submit template from - const QString submitTemplate; + QString submitTemplate; + if (files.count() == 1) + submitTemplate = ccGetComment(workingDir, files.first()); // Create a submit saver.write(submitTemplate.toUtf8()); if (!saver.finalize()) { @@ -1992,6 +1993,13 @@ ViewData ClearCasePlugin::ccGetView(const QString &workingDir) const 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() { QStringList args(QLatin1String("lsstream")); diff --git a/src/plugins/clearcase/clearcaseplugin.h b/src/plugins/clearcase/clearcaseplugin.h index c4a6515a2a9..cee9cc51b33 100644 --- a/src/plugins/clearcase/clearcaseplugin.h +++ b/src/plugins/clearcase/clearcaseplugin.h @@ -152,6 +152,7 @@ public: QString ccGetPredecessor(const QString &version) const; QStringList ccGetActiveVobs() 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, const QString &fileName, const QString &file2 = QString()); FileStatus vcsStatus(const QString &file) const;