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

Gerrit: Use short user name for marking owned changes

Browse Source 
Gerrit provides this data. There's no reason to wait for the query's
result to determine who I am.

Change-Id: Icd0f08fd08cf428dfbadf88224ae21bd4dbc207f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-02-13 22:22:06 +02:00
committed by Orgad Shaneh
parent 9402ddb1e1
commit 0fbe2a125b
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/gerrit/gerritmodel.cpp
View File

@@ -596,6 +596,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
const QString numberKey = "number";
const QString ownerKey = "owner";
const QString ownerNameKey = "name";
const QString ownerUserKey = "username";
const QString ownerEmailKey = "email";
const QString statusKey = "status";
const QString projectKey = "project";
@@ -662,6 +663,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
change->title = object.value(titleKey).toString();
const QJsonObject ownerJ = object.value(ownerKey).toObject();
change->owner = ownerJ.value(ownerNameKey).toString();
change->user = ownerJ.value(ownerUserKey).toString();
change->email = ownerJ.value(ownerEmailKey).toString();
change->project = object.value(projectKey).toString();
change->branch = object.value(branchKey).toString();
@@ -730,11 +732,11 @@ QList<QStandardItem *> GerritModel::changeToRow(const GerritChangePtr &c) const
row[ApprovalsColumn]->setText(c->currentPatchSet.approvalsColumn());
// Mark changes awaiting action using a bold font.
bool bold = false;
if (c->owner == m_userName) { // Owned changes: Review != 0,1. Submit or amend.
if (c->user == m_server->user) { // Owned changes: Review != 0,1. Submit or amend.
const int level = c->currentPatchSet.approvalLevel();
bold = level != 0 && level != 1;
} else if (m_query->currentQuery() == 1) { // Changes pending for review: No review yet.
bold = !m_userName.isEmpty() && !c->currentPatchSet.hasApproval(m_userName);
bold = !m_server->user.isEmpty() && !c->currentPatchSet.hasApproval(m_server->user);
}
if (bold) {
QFont font = row.first()->font();
@@ -797,10 +799,6 @@ void GerritModel::queryFinished(const QByteArray &output)
// Avoid duplicate entries for example in the (unlikely)
// case people do self-reviews.
if (!itemForNumber(c->number)) {
// Determine the verbose user name from the owner of the first query.
// It used for marking the changes pending for review in bold.
if (m_userName.isEmpty() && !m_query->currentQuery())
m_userName = c->owner;
const QList<QStandardItem *> newRow = changeToRow(c);
if (c->depth) {
QStandardItem *parent = itemForNumber(c->dependsOnNumber);

2
src/plugins/git/gerrit/gerritmodel.h
View File

@@ -77,6 +77,7 @@ public:
int neededByNumber = 0;
QString title;
QString owner;
QString user;
QString email;
QString project;
QString branch;
@@ -142,7 +143,6 @@ private:
QSharedPointer<GerritServer> m_server;
QueryContext *m_query = 0;
QueryState m_state = Idle;
QString m_userName;
};
} // namespace Internal