Git: Enable local branch selection in Push to Gerrit

Show dialog even if there are no local commits in current branch

Change-Id: I11e0c6505981712df51bb33694a6cba9704d7324
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-02-08 21:36:06 +02:00
committed by Orgad Shaneh
parent 292e4599aa
commit 1ed9f6bbca
8 changed files with 189 additions and 29 deletions

View File

@@ -61,12 +61,12 @@ public:
QString selectedPushType() const;
QString selectedTopic() const;
QString reviewers() const;
bool localChangesFound() const;
bool valid() const;
private slots:
void setChangeRange();
void setRemoteBranches(bool includeOld = false);
void updateCommits(int index);
private:
typedef QPair<QString, QDate> BranchDate;
@@ -74,12 +74,11 @@ private:
QString determineRemoteBranch();
void initRemoteBranches();
QString calculateChangeRange();
QString calculateChangeRange(const QString &branch);
QString m_workingDir;
QString m_suggestedRemoteBranch;
Ui::GerritPushDialog *m_ui;
RemoteBranchesMap m_remoteBranches;
bool m_localChangesFound;
bool m_valid;
Git::Internal::GitClient *m_client;
};