diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-05-19 16:48:50 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2020-05-19 14:06:48 +0000 |
commit | af455fa40cf6159681d744b68b2a59d21accd3a7 (patch) | |
tree | 47e9637dd5faad9ae9df2e82b1314f31d7f071e2 | |
parent | cad625c739534e29157b20a59df0d8428b26a30e (diff) |
Git: Fix upstream status for branches with slash
Like wip/foo
Change-Id: Ia2816660f7878e872b2e49c4811f5893a1b8dc75
Reviewed-by: André Hartmann <aha_1980@gmx.de>
-rw-r--r-- | src/plugins/git/branchmodel.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 0a40144948..73c7ce5ba8 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -150,6 +150,11 @@ public: return fn; } + QString fullRef(bool includePrefix = false) const + { + return fullName(includePrefix).join('/'); + } + void insert(const QStringList &path, BranchNode *n) { BranchNode *current = this; @@ -186,7 +191,7 @@ public: } return names; } - return {fullName().join('/')}; + return {fullRef()}; } int rowOf(BranchNode *node) @@ -346,7 +351,7 @@ QVariant BranchModel::data(const QModelIndex &index, int role) const return res; } case Qt::EditRole: - return index.column() == 0 ? node->fullName().join('/') : QVariant(); + return index.column() == 0 ? node->fullRef() : QVariant(); case Qt::ToolTipRole: if (!node->isLeaf()) return QVariant(); @@ -381,7 +386,7 @@ bool BranchModel::setData(const QModelIndex &index, const QVariant &value, int r if (newName.isEmpty()) return false; - const QString oldName = node->fullName().join('/'); + const QString oldName = node->fullRef(); if (oldName == newName) return false; @@ -525,7 +530,7 @@ QString BranchModel::fullName(const QModelIndex &idx, bool includePrefix) const return QString(); if (node == d->headNode) return QString("HEAD"); - return node->fullName(includePrefix).join('/'); + return node->fullRef(includePrefix); } QStringList BranchModel::localBranchNames() const @@ -901,7 +906,8 @@ void BranchModel::updateUpstreamStatus(BranchNode *node) { if (node->tracking.isEmpty()) return; - VcsCommand *command = d->client->asyncUpstreamStatus(d->workingDirectory, node->name, node->tracking); + VcsCommand *command = d->client->asyncUpstreamStatus( + d->workingDirectory, node->fullRef(), node->tracking); QObject::connect(command, &VcsCommand::stdOutText, node, [this, node](const QString &text) { const QStringList split = text.trimmed().split('\t'); QTC_ASSERT(split.size() == 2, return); |