Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dolphin: prioritize staged over unstaged status in FileViewGitPlugin::itemVersion()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-07-14 09:13:43 +03:00
parent f0a25101d2
commit 79a2ea618d
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dolphin/plugins/git/fileviewgitplugin.cpp
View file

@ -147,16 +147,28 @@ KVersionControlPlugin::ItemVersion FileViewGitPlugin::itemVersion(const KFileIte
kWarning() << "Could not get status" << gitfile << FileViewGitPlugin::getGitError(); kWarning() << "Could not get status" << gitfile << FileViewGitPlugin::getGitError();
return KVersionControlPlugin::UnversionedVersion; return KVersionControlPlugin::UnversionedVersion;
} }
if (gitstatusflags & GIT_STATUS_INDEX_NEW || gitstatusflags & GIT_STATUS_WT_NEW) { if (gitstatusflags & GIT_STATUS_INDEX_NEW) {
kDebug() << "New file" << item; kDebug() << "New staged file" << item;
return KVersionControlPlugin::AddedVersion; return KVersionControlPlugin::AddedVersion;
} }
if (gitstatusflags & GIT_STATUS_INDEX_MODIFIED || gitstatusflags & GIT_STATUS_WT_MODIFIED) { if (gitstatusflags & GIT_STATUS_INDEX_MODIFIED) {
kDebug() << "Modified file" << item; kDebug() << "Modified staged file" << item;
return KVersionControlPlugin::LocallyModifiedVersion; return KVersionControlPlugin::LocallyModifiedVersion;
} }
if (gitstatusflags & GIT_STATUS_INDEX_DELETED || gitstatusflags & GIT_STATUS_WT_DELETED) { if (gitstatusflags & GIT_STATUS_INDEX_DELETED) {
kDebug() << "Deleted file" << item; kDebug() << "Deleted staged file" << item;
return KVersionControlPlugin::RemovedVersion;
}
if (gitstatusflags & GIT_STATUS_WT_NEW) {
kDebug() << "New unstaged file" << item;
return KVersionControlPlugin::AddedVersion;
}
if (gitstatusflags & GIT_STATUS_WT_MODIFIED) {
kDebug() << "Modified unstaged file" << item;
return KVersionControlPlugin::LocallyModifiedVersion;
}
if (gitstatusflags & GIT_STATUS_WT_DELETED) {
kDebug() << "Deleted unstaged file" << item;
return KVersionControlPlugin::RemovedVersion; return KVersionControlPlugin::RemovedVersion;
} }
if (gitstatusflags & GIT_STATUS_IGNORED) { if (gitstatusflags & GIT_STATUS_IGNORED) {