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

Git: Minor cleanup

Browse Source 
Change-Id: I577be16b310566700f5d70d0f372e90094ff835e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2024-08-05 23:47:58 +03:00
committed by Orgad Shaneh
parent 9dab376f40
commit 35df237df2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/gitclient.cpp
View File

@@ -61,7 +61,7 @@
const char GIT_DIRECTORY[] = ".git"; const char GIT_DIRECTORY[] = ".git";
const char HEAD[] = "HEAD"; const char HEAD[] = "HEAD";
const char CHERRY_PICK_HEAD[] = "CHERRY_PICK_HEAD"; const char CHERRY_PICK_HEAD[] = "CHERRY_PICK_HEAD";
[[maybe_unused]] const char BRANCHES_PREFIX[] = "Branches: "; const char BRANCHES_PREFIX[] = "Branches: ";
const char stashNamePrefix[] = "stash@{"; const char stashNamePrefix[] = "stash@{";
const char noColorOption[] = "--no-color"; const char noColorOption[] = "--no-color";
const char colorOption[] = "--color=always"; const char colorOption[] = "--color=always";
@@ -467,7 +467,7 @@ ShowController::ShowController(IDocument *document, const QString &id)
const auto updateDescription = [this](const ReloadStorage &storage) { const auto updateDescription = [this](const ReloadStorage &storage) {
QString desc = storage.m_header; QString desc = storage.m_header;
if (!storage.m_branches.isEmpty()) if (!storage.m_branches.isEmpty())
desc.append("Branches: " + storage.m_branches + '\n'); desc.append(BRANCHES_PREFIX + storage.m_branches + '\n');
if (!storage.m_precedes.isEmpty()) if (!storage.m_precedes.isEmpty())
desc.append("Precedes: " + storage.m_precedes + '\n'); desc.append("Precedes: " + storage.m_precedes + '\n');
QStringList follows; QStringList follows;
@@ -963,7 +963,7 @@ FilePaths GitClient::unmanagedFiles(const FilePaths &filePaths) const
return filePaths; return filePaths;
const auto toAbs = [&wd](const QString &fp) { return wd.absoluteFilePath(fp); }; const auto toAbs = [&wd](const QString &fp) { return wd.absoluteFilePath(fp); };
const QStringList managedFilePaths = const QStringList managedFilePaths =
Utils::transform(result.cleanedStdOut().split('\0', Qt::SkipEmptyParts), toAbs); Utils::transform(result.cleanedStdOut().split(QChar('\0'), Qt::SkipEmptyParts), toAbs);
const QStringList absPaths = Utils::transform(it.value(), toAbs); const QStringList absPaths = Utils::transform(it.value(), toAbs);
const QStringList filtered = Utils::filtered(absPaths, [&managedFilePaths](const QString &fp) { const QStringList filtered = Utils::filtered(absPaths, [&managedFilePaths](const QString &fp) {
return !managedFilePaths.contains(fp); return !managedFilePaths.contains(fp);