forked from qt-creator/qt-creator
133 lines
4.8 KiB
C++
133 lines
4.8 KiB
C++
/**************************************************************************
|
|
**
|
|
** This file is part of Qt Creator
|
|
**
|
|
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
|
**
|
|
** Contact: Nokia Corporation (info@qt.nokia.com)
|
|
**
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
**
|
|
** This file may be used under the terms of the GNU Lesser General Public
|
|
** License version 2.1 as published by the Free Software Foundation and
|
|
** appearing in the file LICENSE.LGPL included in the packaging of this file.
|
|
** Please review the following information to ensure the GNU Lesser General
|
|
** Public License version 2.1 requirements will be met:
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** Other Usage
|
|
**
|
|
** Alternatively, this file may be used in accordance with the terms and
|
|
** conditions contained in a signed written agreement between you and Nokia.
|
|
**
|
|
** If you have questions regarding the use of this file, please contact
|
|
** Nokia at info@qt.nokia.com.
|
|
**
|
|
**************************************************************************/
|
|
|
|
#include "gitsubmiteditor.h"
|
|
#include "gitsubmiteditorwidget.h"
|
|
#include "gitconstants.h"
|
|
#include "commitdata.h"
|
|
|
|
#include <vcsbase/submitfilemodel.h>
|
|
|
|
#include <QtCore/QDebug>
|
|
#include <QtCore/QStringList>
|
|
|
|
namespace Git {
|
|
namespace Internal {
|
|
|
|
enum { FileTypeRole = Qt::UserRole + 1 };
|
|
enum FileType { StagedFile , UnstagedFile, UntrackedFile };
|
|
|
|
/* The problem with git is that no diff can be obtained to for a random
|
|
* multiselection of staged/unstaged files; it requires the --cached
|
|
* option for staged files. So, we sort apart the diff file lists
|
|
* according to a type flag we add to the model. */
|
|
|
|
GitSubmitEditor::GitSubmitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters, QWidget *parent) :
|
|
VCSBaseSubmitEditor(parameters, new GitSubmitEditorWidget(parent)),
|
|
m_model(0)
|
|
{
|
|
connect(this, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(slotDiffSelected(QStringList)));
|
|
}
|
|
|
|
GitSubmitEditorWidget *GitSubmitEditor::submitEditorWidget()
|
|
{
|
|
return static_cast<GitSubmitEditorWidget *>(widget());
|
|
}
|
|
|
|
// Utility to add a list of state/file pairs to the model
|
|
// setting a file type.
|
|
static void addStateFileListToModel(const QList<CommitData::StateFilePair> &l,
|
|
bool checked, FileType ft,
|
|
VCSBase::SubmitFileModel *model)
|
|
{
|
|
typedef QList<CommitData::StateFilePair>::const_iterator ConstIterator;
|
|
if (!l.empty()) {
|
|
const ConstIterator cend = l.constEnd();
|
|
const QVariant fileTypeData(ft);
|
|
for (ConstIterator it = l.constBegin(); it != cend; ++it)
|
|
model->addFile(it->second, it->first, checked).front()->setData(fileTypeData, FileTypeRole);
|
|
}
|
|
}
|
|
|
|
void GitSubmitEditor::setCommitData(const CommitData &d)
|
|
{
|
|
submitEditorWidget()->setPanelData(d.panelData);
|
|
submitEditorWidget()->setPanelInfo(d.panelInfo);
|
|
|
|
m_model = new VCSBase::SubmitFileModel(this);
|
|
addStateFileListToModel(d.stagedFiles, true, StagedFile, m_model);
|
|
addStateFileListToModel(d.unstagedFiles, false, UnstagedFile, m_model);
|
|
if (!d.untrackedFiles.empty()) {
|
|
const QString untrackedSpec = QLatin1String("untracked");
|
|
const QVariant fileTypeData(UntrackedFile);
|
|
const QStringList::const_iterator cend = d.untrackedFiles.constEnd();
|
|
for (QStringList::const_iterator it = d.untrackedFiles.constBegin(); it != cend; ++it)
|
|
m_model->addFile(*it, untrackedSpec, false).front()->setData(fileTypeData, FileTypeRole);
|
|
}
|
|
setFileModel(m_model);
|
|
}
|
|
|
|
void GitSubmitEditor::slotDiffSelected(const QStringList &files)
|
|
{
|
|
// Sort it apart into staged/unstaged files
|
|
QStringList unstagedFiles;
|
|
QStringList stagedFiles;
|
|
const int fileColumn = fileNameColumn();
|
|
const int rowCount = m_model->rowCount();
|
|
for (int r = 0; r < rowCount; r++) {
|
|
const QString fileName = m_model->item(r, fileColumn)->text();
|
|
if (files.contains(fileName)) {
|
|
const FileType ft = static_cast<FileType>(m_model->item(r, 0)->data(FileTypeRole).toInt());
|
|
switch (ft) {
|
|
case StagedFile:
|
|
stagedFiles.push_back(fileName);
|
|
break;
|
|
case UnstagedFile:
|
|
unstagedFiles.push_back(fileName);
|
|
break;
|
|
case UntrackedFile:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (!unstagedFiles.empty() || !stagedFiles.empty())
|
|
emit diff(unstagedFiles, stagedFiles);
|
|
}
|
|
|
|
GitSubmitEditorPanelData GitSubmitEditor::panelData() const
|
|
{
|
|
return const_cast<GitSubmitEditor*>(this)->submitEditorWidget()->panelData();
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace Git
|