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
88d3f92d
Commit
88d3f92d
authored
Dec 27, 2020
by
Méven Car
Committed by
Elvis Angelaccio
Dec 27, 2020
Browse files
Apply sugestions
parent
f6a465c9
Pipeline
#45460
passed with stage
in 6 minutes and 48 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/views/versioncontrol/versioncontrolobserver.cpp
View file @
88d3f92d
...
...
@@ -155,7 +155,7 @@ void VersionControlObserver::verifyDirectory()
}
if
(
m_plugin
!=
nullptr
)
{
if
(
!
rootItem
.
url
().
path
().
startsWith
(
m_local
e
RepoRoot
)
||
!
QFile
::
exists
(
m_local
e
RepoRoot
+
'/'
+
m_plugin
->
fileName
()))
{
if
(
!
rootItem
.
url
().
path
().
startsWith
(
m_localRepoRoot
)
||
!
QFile
::
exists
(
m_localRepoRoot
+
'/'
+
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_local
e
RepoRoot
=
directory
.
path
();
m_localRepoRoot
=
directory
.
path
();
return
plugin
;
}
auto
wcR
oot
=
plugin
->
localRepositoryRoot
(
directory
.
path
());
if
(
!
wcR
oot
.
isEmpty
())
{
m_local
e
RepoRoot
=
wcR
oot
;
auto
r
oot
=
plugin
->
localRepositoryRoot
(
directory
.
path
());
if
(
!
r
oot
.
isEmpty
())
{
m_localRepoRoot
=
r
oot
;
return
plugin
;
}
}
...
...
src/views/versioncontrol/versioncontrolobserver.h
View file @
88d3f92d
...
...
@@ -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_local
e
RepoRoot
;
QString
m_localRepoRoot
;
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