mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-17 15:31:20 +00:00
Review feedback
This commit is contained in:
parent
c1739d5c4d
commit
f6a465c911
|
@ -183,6 +183,7 @@ public:
|
||||||
* @return List of actions that are available for the out of version control
|
* @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
|
* items \p items. It's opposed to the \p versionedActions. Common usage
|
||||||
* is for clone/checkout actions.
|
* is for clone/checkout actions.
|
||||||
|
* @since 21.04
|
||||||
*/
|
*/
|
||||||
virtual QList<QAction*> outOfVersionControlActions(const KFileItemList& items) const = 0;
|
virtual QList<QAction*> outOfVersionControlActions(const KFileItemList& items) const = 0;
|
||||||
|
|
||||||
|
|
|
@ -155,7 +155,7 @@ void VersionControlObserver::verifyDirectory()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_plugin != nullptr) {
|
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;
|
m_plugin = nullptr;
|
||||||
|
|
||||||
// The directory is not versioned. Reset the verification timer to a higher
|
// 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
|
// first naively check if we are at working copy root
|
||||||
const QString fileName = directory.path() + '/' + plugin->fileName();
|
const QString fileName = directory.path() + '/' + plugin->fileName();
|
||||||
if (QFile::exists(fileName)) {
|
if (QFile::exists(fileName)) {
|
||||||
m_wcRoot = directory.path();
|
m_localeRepoRoot = directory.path();
|
||||||
return plugin;
|
return plugin;
|
||||||
}
|
}
|
||||||
auto wcRoot = plugin->localRepositoryRoot(directory.path());
|
auto wcRoot = plugin->localRepositoryRoot(directory.path());
|
||||||
if (!wcRoot.isEmpty()) {
|
if (!wcRoot.isEmpty()) {
|
||||||
m_wcRoot = wcRoot;
|
m_localeRepoRoot = wcRoot;
|
||||||
return plugin;
|
return plugin;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -137,7 +137,7 @@ private:
|
||||||
bool m_pendingItemStatesUpdate;
|
bool m_pendingItemStatesUpdate;
|
||||||
bool m_silentUpdate; // if true, no messages will be send during the update
|
bool m_silentUpdate; // if true, no messages will be send during the update
|
||||||
// of version states
|
// of version states
|
||||||
QString m_wcRoot;
|
QString m_localeRepoRoot;
|
||||||
|
|
||||||
DolphinView* m_view;
|
DolphinView* m_view;
|
||||||
KFileItemModel* m_model;
|
KFileItemModel* m_model;
|
||||||
|
|
Loading…
Reference in a new issue