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
System
Dolphin
Commits
f6a465c9
Commit
f6a465c9
authored
Dec 08, 2020
by
Méven Car
Committed by
Elvis Angelaccio
Dec 27, 2020
Browse files
Review feedback
parent
c1739d5c
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/views/versioncontrol/kversioncontrolplugin.h
View file @
f6a465c9
...
...
@@ -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
;
...
...
src/views/versioncontrol/versioncontrolobserver.cpp
View file @
f6a465c9
...
...
@@ -155,7 +155,7 @@ void VersionControlObserver::verifyDirectory()
}
if
(
m_plugin
!=
nullptr
)
{
if
(
!
rootItem
.
url
().
path
().
startsWith
(
m_
wc
Root
)
||
!
QFile
::
exists
(
m_
wc
Root
+
'/'
+
m_plugin
->
fileName
()))
{
if
(
!
rootItem
.
url
().
path
().
startsWith
(
m_
localeRepo
Root
)
||
!
QFile
::
exists
(
m_
localeRepo
Root
+
'/'
+
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_
wc
Root
=
directory
.
path
();
m_
localeRepo
Root
=
directory
.
path
();
return
plugin
;
}
auto
wcRoot
=
plugin
->
localRepositoryRoot
(
directory
.
path
());
if
(
!
wcRoot
.
isEmpty
())
{
m_
wc
Root
=
wcRoot
;
m_
localeRepo
Root
=
wcRoot
;
return
plugin
;
}
}
...
...
src/views/versioncontrol/versioncontrolobserver.h
View file @
f6a465c9
...
...
@@ -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_
wc
Root
;
QString
m_
localeRepo
Root
;
DolphinView
*
m_view
;
KFileItemModel
*
m_model
;
...
...
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