Skip to content
Snippets Groups Projects
gitsubmiteditor.cpp 6.68 KiB
Newer Older
hjk's avatar
hjk committed
/****************************************************************************
con's avatar
con committed
**
hjk's avatar
hjk committed
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
con's avatar
con committed
**
hjk's avatar
hjk committed
** This file is part of Qt Creator.
con's avatar
con committed
**
hjk's avatar
hjk committed
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia.  For licensing terms and
** conditions see http://qt.digia.com/licensing.  For further information
** use the contact form at http://qt.digia.com/contact-us.
** GNU Lesser General Public License Usage
hjk's avatar
hjk committed
** Alternatively, 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, Digia gives you certain additional
** rights.  These rights are described in the Digia Qt LGPL Exception
con's avatar
con committed
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
hjk's avatar
hjk committed
****************************************************************************/
hjk's avatar
hjk committed

#include "commitdata.h"
#include "gitclient.h"
#include "gitconstants.h"
#include "gitplugin.h"
con's avatar
con committed
#include "gitsubmiteditor.h"
#include "gitsubmiteditorwidget.h"

#include <utils/qtcassert.h>
#include <vcsbase/vcsbaseoutputwindow.h>
#include <QDebug>
#include <QStringList>
#include <QTextCodec>
con's avatar
con committed

namespace Git {
namespace Internal {

/* 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. */
hjk's avatar
hjk committed
GitSubmitEditor::GitSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, QWidget *parent) :
    VcsBaseSubmitEditor(parameters, new GitSubmitEditorWidget(parent)),
    m_model(0),
    m_amend(false)
con's avatar
con committed
{
    connect(this, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(slotDiffSelected(QStringList)));
con's avatar
con committed
}

GitSubmitEditorWidget *GitSubmitEditor::submitEditorWidget()
{
    return static_cast<GitSubmitEditorWidget *>(widget());
}

static void mergeFileModels(VcsBase::SubmitFileModel *model, const VcsBase::SubmitFileModel *source)
{
    int j = 0;
    for (int i = 0; i < model->rowCount() && j < source->rowCount(); ++i) {
        CommitData::StateFilePair stateFile(
                    static_cast<FileStates>(model->extraData(i).toInt()), model->file(i));
        for (; j < source->rowCount(); ++j) {
            CommitData::StateFilePair sourceStateFile(
                        static_cast<FileStates>(source->extraData(j).toInt()), source->file(j));
            if (stateFile == sourceStateFile) {
                model->setChecked(i, source->checked(j));
                break;
            } else if (stateFile < sourceStateFile) {
                break;
            }
        }
    }
}

con's avatar
con committed
void GitSubmitEditor::setCommitData(const CommitData &d)
{
    GitSubmitEditorWidget *w = submitEditorWidget();
    w->setPanelData(d.panelData);
    w->setPanelInfo(d.panelInfo);
    w->setHasUnmerged(false);
con's avatar
con committed

    m_commitEncoding = d.commitEncoding;
    m_workingDirectory = d.panelInfo.repository;
    VcsBase::SubmitFileModel *oldModel = m_model;
hjk's avatar
hjk committed
    m_model = new VcsBase::SubmitFileModel(this);
    if (!d.files.isEmpty()) {
        for (QList<CommitData::StateFilePair>::const_iterator it = d.files.constBegin();
             it != d.files.constEnd(); ++it) {
            const FileStates state = it->first;
            const QString file = it->second;
            VcsBase::CheckMode checkMode;
            if (state & UnmergedFile) {
                checkMode = VcsBase::Uncheckable;
                w->setHasUnmerged(true);
            } else if (state & StagedFile) {
                checkMode = VcsBase::Checked;
                checkMode = VcsBase::Unchecked;
            m_model->addFile(file, CommitData::stateDisplayName(state), checkMode,
                             QVariant(static_cast<int>(state)));
        }
    if (oldModel) {
        mergeFileModels(m_model, oldModel);
        delete oldModel;
    }
    setFileModel(m_model, d.panelInfo.repository);
void GitSubmitEditor::setAmend(bool amend)
{
    m_amend = amend;
    setEmptyFileListEnabled(amend); // Allow for just correcting the message
}

void GitSubmitEditor::slotDiffSelected(const QStringList &files)
{
    // Sort it apart into unmerged/staged/unstaged files
    QStringList unmergedFiles;
    QStringList unstagedFiles;
    QStringList stagedFiles;
    const int rowCount = m_model->rowCount();
    for (int r = 0; r < rowCount; r++) {
        const QString fileName = m_model->file(r);
        if (files.contains(fileName)) {
            const FileStates state = static_cast<FileStates>(m_model->extraData(r).toInt());
            if (state & UnmergedFile)
                unmergedFiles.push_back(fileName);
            else if (state & StagedFile)
                stagedFiles.push_back(fileName);
            else if (state != UntrackedFile)
                unstagedFiles.push_back(fileName);
        }
    if (!unstagedFiles.empty() || !stagedFiles.empty())
        emit diff(unstagedFiles, stagedFiles);
    if (!unmergedFiles.empty())
        emit merge(unmergedFiles);
con's avatar
con committed
}

void GitSubmitEditor::updateFileModel()
{
    GitClient *client = GitPlugin::instance()->gitClient();
    QString errorMessage, commitTemplate;
    CommitData data;
    if (client->getCommitData(m_workingDirectory, m_amend, &commitTemplate, &data, &errorMessage))
        setCommitData(data);
    else
        VcsBase::VcsBaseOutputWindow::instance()->append(errorMessage);
}

con's avatar
con committed
GitSubmitEditorPanelData GitSubmitEditor::panelData() const
{
    return const_cast<GitSubmitEditor*>(this)->submitEditorWidget()->panelData();
}

QByteArray GitSubmitEditor::fileContents() const
{
    const QString& text = const_cast<GitSubmitEditor*>(this)->submitEditorWidget()->descriptionText();

    if (!m_commitEncoding.isEmpty()) {
        // Do the encoding convert, When use user-defined encoding
        // e.g. git config --global i18n.commitencoding utf-8
        QTextCodec *codec = QTextCodec::codecForName(m_commitEncoding.toLocal8Bit());
        if (codec)
            return codec->fromUnicode(text);
    }

    // Using utf-8 as the default encoding
    return text.toUtf8();
}

hjk's avatar
hjk committed
} // namespace Internal
} // namespace Git