kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review feedback

Browse source
This commit is contained in:
Méven Car 2020-12-08 23:09:52 +01:00 committed by Elvis Angelaccio
parent c1739d5c4d
commit f6a465c911
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/views/versioncontrol/kversioncontrolplugin.h
View file

@ -183,6 +183,7 @@ public:
* @return List of actions that are available for the out of version control
* items \p items. It's opposed to the \p versionedActions. Common usage
* is for clone/checkout actions.
* @since 21.04
*/
virtual QList<QAction*> outOfVersionControlActions(const KFileItemList& items) const = 0;

6
src/views/versioncontrol/versioncontrolobserver.cpp
View file

@ -155,7 +155,7 @@ void VersionControlObserver::verifyDirectory()
}
if (m_plugin != nullptr) {
if (!rootItem.url().path().startsWith(m_wcRoot) || !QFile::exists(m_wcRoot + '/' + m_plugin->fileName())) {
if (!rootItem.url().path().startsWith(m_localeRepoRoot) || !QFile::exists(m_localeRepoRoot + '/' + m_plugin->fileName())) {
m_plugin = nullptr;
// The directory is not versioned. Reset the verification timer to a higher
@ -310,12 +310,12 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director
// first naively check if we are at working copy root
const QString fileName = directory.path() + '/' + plugin->fileName();
if (QFile::exists(fileName)) {
m_wcRoot = directory.path();
m_localeRepoRoot = directory.path();
return plugin;
}
auto wcRoot = plugin->localRepositoryRoot(directory.path());
if (!wcRoot.isEmpty()) {
m_wcRoot = wcRoot;
m_localeRepoRoot = wcRoot;
return plugin;
}
}

2
src/views/versioncontrol/versioncontrolobserver.h
View file

@ -137,7 +137,7 @@ private:
bool m_pendingItemStatesUpdate;
bool m_silentUpdate; // if true, no messages will be send during the update
// of version states
QString m_wcRoot;
QString m_localeRepoRoot;
DolphinView* m_view;
KFileItemModel* m_model;