forked from qt-creator/qt-creator
Git: Support entry list in reflog
Change-Id: Ic24eff465c6870f42c1964a8700cc6f0b2c0dce5 Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
committed by
Orgad Shaneh
parent
857102748d
commit
ee05e49f79
@@ -129,13 +129,27 @@ private:
|
||||
GitClient *m_client;
|
||||
};
|
||||
|
||||
class GitReflogEditorWidget : public GitEditorWidget
|
||||
{
|
||||
public:
|
||||
GitReflogEditorWidget()
|
||||
{
|
||||
setLogEntryPattern(QRegExp("^([0-9a-f]{8,}) [^}]*\\}: .*$"));
|
||||
}
|
||||
|
||||
QString revisionSubject(const QTextBlock &inBlock) const override
|
||||
{
|
||||
const QString text = inBlock.text();
|
||||
return text.mid(text.indexOf(' ') + 1);
|
||||
}
|
||||
};
|
||||
|
||||
class GitLogEditorWidget : public QWidget
|
||||
{
|
||||
Q_DECLARE_TR_FUNCTIONS(Git::Internal::GitLogEditorWidget);
|
||||
public:
|
||||
GitLogEditorWidget()
|
||||
GitLogEditorWidget(GitEditorWidget *gitEditor)
|
||||
{
|
||||
auto gitEditor = new GitEditorWidget;
|
||||
auto vlayout = new QVBoxLayout;
|
||||
auto hlayout = new QHBoxLayout;
|
||||
vlayout->setSpacing(0);
|
||||
@@ -175,6 +189,13 @@ private:
|
||||
}
|
||||
};
|
||||
|
||||
template<class Editor>
|
||||
class GitLogEditorWidgetT : public GitLogEditorWidget
|
||||
{
|
||||
public:
|
||||
GitLogEditorWidgetT() : GitLogEditorWidget(new Editor) {}
|
||||
};
|
||||
|
||||
const unsigned minimumRequiredVersion = 0x010900;
|
||||
|
||||
const VcsBaseSubmitEditorParameters submitParameters {
|
||||
@@ -198,6 +219,13 @@ const VcsBaseEditorParameters logEditorParameters {
|
||||
"text/vnd.qtcreator.git.log"
|
||||
};
|
||||
|
||||
const VcsBaseEditorParameters reflogEditorParameters {
|
||||
LogOutput,
|
||||
Git::Constants::GIT_REFLOG_EDITOR_ID,
|
||||
Git::Constants::GIT_REFLOG_EDITOR_DISPLAY_NAME,
|
||||
"text/vnd.qtcreator.git.reflog"
|
||||
};
|
||||
|
||||
const VcsBaseEditorParameters blameEditorParameters {
|
||||
AnnotateOutput,
|
||||
Git::Constants::GIT_BLAME_EDITOR_ID,
|
||||
@@ -397,7 +425,13 @@ public:
|
||||
|
||||
VcsEditorFactory logEditorFactory {
|
||||
&logEditorParameters,
|
||||
[] { return new GitLogEditorWidget; },
|
||||
[] { return new GitLogEditorWidgetT<GitEditorWidget>; },
|
||||
std::bind(&GitPluginPrivate::describe, this, _1, _2)
|
||||
};
|
||||
|
||||
VcsEditorFactory reflogEditorFactory {
|
||||
&reflogEditorParameters,
|
||||
[] { return new GitLogEditorWidgetT<GitReflogEditorWidget>; },
|
||||
std::bind(&GitPluginPrivate::describe, this, _1, _2)
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user