Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
Kate
Commits
cd644d7c
Commit
cd644d7c
authored
Feb 11, 2021
by
Waqar Ahmed
Browse files
Fix branch fetch from git
parent
d1466863
Changes
1
Hide whitespace changes
Inline
Side-by-side
addons/project/gitutils.cpp
View file @
cd644d7c
...
...
@@ -66,23 +66,17 @@ GitUtils::CheckoutResult GitUtils::checkoutNewBranch(const QString &repo, const
return
res
;
}
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
constexpr
auto
SkipEmptyParts
=
QString
::
SkipEmptyParts
;
#else
constexpr
auto
SkipEmptyParts
=
Qt
::
SkipEmptyParts
;
#endif
static
GitUtils
::
Branch
parseLocalBranch
(
const
QString
&
raw
)
{
auto
data
=
raw
.
split
(
QStringLiteral
(
"{sp}"
),
SkipEmptyParts
);
return
GitUtils
::
Branch
{
data
.
first
().
remove
(
QLatin1String
(
"refs/heads/"
)
),
QString
(),
GitUtils
::
Head
};
// refs/heads/ = 11
return
GitUtils
::
Branch
{
raw
.
mid
(
11
),
QString
(),
GitUtils
::
Head
};
}
static
GitUtils
::
Branch
parseRemoteBranch
(
const
QString
&
raw
)
{
auto
data
=
raw
.
split
(
QStringLiteral
(
"{sp}"
),
SkipEmptyParts
);
int
indexofRemote
=
data
.
at
(
0
)
.
indexOf
(
QLatin1Char
(
'/'
),
13
);
return
GitUtils
::
Branch
{
data
.
first
().
remove
(
QLatin1String
(
"refs/remotes/"
)),
data
.
at
(
0
)
.
mid
(
13
,
indexofRemote
-
13
),
GitUtils
::
Remote
};
// refs/remotes/origin/asdasdasd = 13
int
indexofRemote
=
raw
.
indexOf
(
QLatin1Char
(
'/'
),
13
);
return
GitUtils
::
Branch
{
raw
.
mid
(
13
),
raw
.
mid
(
13
,
indexofRemote
-
13
),
GitUtils
::
Remote
};
}
QVector
<
GitUtils
::
Branch
>
GitUtils
::
getAllBranchesAndTags
(
const
QString
&
repo
,
RefType
ref
)
...
...
@@ -91,7 +85,7 @@ QVector<GitUtils::Branch> GitUtils::getAllBranchesAndTags(const QString &repo, R
QProcess
git
;
git
.
setWorkingDirectory
(
repo
);
QStringList
args
{
QStringLiteral
(
"for-each-ref"
),
QStringLiteral
(
"--format"
),
QStringLiteral
(
"%(refname)
{sp}
"
),
QStringLiteral
(
"--sort=-committerdate"
)};
QStringList
args
{
QStringLiteral
(
"for-each-ref"
),
QStringLiteral
(
"--format"
),
QStringLiteral
(
"%(refname)"
),
QStringLiteral
(
"--sort=-committerdate"
)};
if
(
ref
&
RefType
::
Head
)
{
args
.
append
(
QStringLiteral
(
"refs/heads"
));
}
...
...
@@ -117,8 +111,8 @@ QVector<GitUtils::Branch> GitUtils::getAllBranchesAndTags(const QString &repo, R
}
else
if
(
ref
&
Remote
&&
o
.
startsWith
(
QLatin1String
(
"refs/remotes"
)))
{
branches
.
append
(
parseRemoteBranch
(
o
));
}
else
if
(
ref
&
Tag
&&
o
.
startsWith
(
QLatin1String
(
"refs/tags/"
)))
{
int
indexofSp
=
o
.
indexOf
(
QLatin1String
(
"{sp}"
));
branches
.
append
({
o
.
mid
(
10
,
indexofSp
),
{},
RefType
::
Tag
});
// refs/tags/ = 10
branches
.
append
({
o
.
mid
(
10
),
{},
RefType
::
Tag
});
}
}
// clang-format on
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment