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

Git: Refresh log entries on fixup commit

Browse Source 
Change-Id: Icd14c8916dc006874b77aa922b3f1c6746e0549c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-14 17:21:14 +03:00
committed by Orgad Shaneh
parent 1fde77f6e8
commit 9f72e43fb1
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/git/gitsubmiteditor.cpp
View File

@@ -176,6 +176,7 @@ void GitSubmitEditor::updateFileModel()
CommitData data(m_commitType); CommitData data(m_commitType);
if (client->getCommitData(m_workingDirectory, &commitTemplate, data, &errorMessage)) { if (client->getCommitData(m_workingDirectory, &commitTemplate, data, &errorMessage)) {
setCommitData(data); setCommitData(data);
submitEditorWidget()->refreshLog(m_workingDirectory);
} else { } else {
VcsBase::VcsBaseOutputWindow::instance()->append(errorMessage); VcsBase::VcsBaseOutputWindow::instance()->append(errorMessage);
m_forceClose = true; m_forceClose = true;

6
src/plugins/git/gitsubmiteditorwidget.cpp
View File

@@ -102,6 +102,12 @@ void GitSubmitEditorWidget::initialize(CommitType commitType, const QString &rep
insertTopWidget(m_gitSubmitPanel); insertTopWidget(m_gitSubmitPanel);
} }
void GitSubmitEditorWidget::refreshLog(const QString &repository)
{
if (m_logChangeWidget)
m_logChangeWidget->init(repository, QString(), false);
}
GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const
{ {
GitSubmitEditorPanelData rc; GitSubmitEditorPanelData rc;

1
src/plugins/git/gitsubmiteditorwidget.h
View File

@@ -71,6 +71,7 @@ public:
QString amendSHA1() const; QString amendSHA1() const;
void setHasUnmerged(bool e); void setHasUnmerged(bool e);
void initialize(CommitType commitType, const QString &repository); void initialize(CommitType commitType, const QString &repository);
void refreshLog(const QString &repository);
protected: protected:
bool canSubmit() const; bool canSubmit() const;