forked from qt-creator/qt-creator
Git: Move hasRemotes out of panel data
It is input only, and doesn't belong to the panel Also rename it enablePush Change-Id: I9d5e2246ce76854a54b02e69980214dd35a402ee Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
589d9c7773
commit
c07eaa2a25
@@ -54,7 +54,6 @@ void GitSubmitEditorPanelData::clear()
|
||||
email.clear();
|
||||
bypassHooks = false;
|
||||
pushAction = NoPush;
|
||||
hasRemotes = false;
|
||||
}
|
||||
|
||||
QString GitSubmitEditorPanelData::authorString() const
|
||||
@@ -79,7 +78,9 @@ QDebug operator<<(QDebug d, const GitSubmitEditorPanelData &data)
|
||||
return d;
|
||||
}
|
||||
|
||||
CommitData::CommitData(CommitType type) : commitType(type)
|
||||
CommitData::CommitData(CommitType type)
|
||||
: commitType(type)
|
||||
, enablePush(false)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -88,6 +89,7 @@ void CommitData::clear()
|
||||
panelInfo.clear();
|
||||
panelData.clear();
|
||||
amendSHA1.clear();
|
||||
enablePush = false;
|
||||
|
||||
files.clear();
|
||||
}
|
||||
|
||||
@@ -68,7 +68,6 @@ struct GitSubmitEditorPanelData
|
||||
QString email;
|
||||
bool bypassHooks;
|
||||
PushAction pushAction;
|
||||
bool hasRemotes;
|
||||
};
|
||||
|
||||
QDebug operator<<(QDebug d, const GitSubmitEditorPanelData &);
|
||||
@@ -115,6 +114,7 @@ public:
|
||||
QString commitEncoding;
|
||||
GitSubmitEditorPanelInfo panelInfo;
|
||||
GitSubmitEditorPanelData panelData;
|
||||
bool enablePush;
|
||||
|
||||
QList<StateFilePair> files;
|
||||
|
||||
|
||||
@@ -3045,7 +3045,7 @@ bool GitClient::getCommitData(const QString &workingDirectory,
|
||||
break;
|
||||
}
|
||||
|
||||
commitData.panelData.hasRemotes = !synchronousRemotesList(repoDirectory).isEmpty();
|
||||
commitData.enablePush = !synchronousRemotesList(repoDirectory).isEmpty();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -111,7 +111,7 @@ void GitSubmitEditor::setCommitData(const CommitData &d)
|
||||
m_amendSHA1 = d.amendSHA1;
|
||||
|
||||
GitSubmitEditorWidget *w = submitEditorWidget();
|
||||
w->initialize(m_commitType, m_workingDirectory, d.panelData, d.panelInfo);
|
||||
w->initialize(m_commitType, m_workingDirectory, d.panelData, d.panelInfo, d.enablePush);
|
||||
w->setHasUnmerged(false);
|
||||
|
||||
setEmptyFileListEnabled(m_commitType == AmendCommit); // Allow for just correcting the message
|
||||
|
||||
@@ -87,7 +87,8 @@ void GitSubmitEditorWidget::setHasUnmerged(bool e)
|
||||
void GitSubmitEditorWidget::initialize(CommitType commitType,
|
||||
const QString &repository,
|
||||
const GitSubmitEditorPanelData &data,
|
||||
const GitSubmitEditorPanelInfo &info)
|
||||
const GitSubmitEditorPanelInfo &info,
|
||||
bool enablePush)
|
||||
{
|
||||
if (m_isInitialized)
|
||||
return;
|
||||
@@ -108,7 +109,7 @@ void GitSubmitEditorWidget::initialize(CommitType commitType,
|
||||
setPanelData(data);
|
||||
setPanelInfo(info);
|
||||
|
||||
if (data.hasRemotes && commitType != FixupCommit) {
|
||||
if (enablePush && commitType != FixupCommit) {
|
||||
QMenu *menu = new QMenu(this);
|
||||
menu->addAction(tr("&Commit only"), this, SLOT(commitOnlySlot()));
|
||||
menu->addAction(tr("Commit and &Push"), this, SLOT(commitAndPushSlot()));
|
||||
|
||||
@@ -72,7 +72,8 @@ public:
|
||||
void initialize(CommitType commitType,
|
||||
const QString &repository,
|
||||
const GitSubmitEditorPanelData &data,
|
||||
const GitSubmitEditorPanelInfo &info);
|
||||
const GitSubmitEditorPanelInfo &info,
|
||||
bool enablePush);
|
||||
void refreshLog(const QString &repository);
|
||||
|
||||
protected:
|
||||
|
||||
Reference in New Issue
Block a user