VCS: adjust internal structure

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28303 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 6e8b5655545e62e9c5e52989aaa6b0d74aa77a22..aed6d012682f3ab1ea9158199e8280ba2ed5bde1 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -455,10 +455,17 @@ FileName const SVN::findFile(FileName const & file)
 
 void SVN::scanMaster()
 {
-       // if we want some locking under svn
-       // we need different infrastructure around
-       locker_ = "Unlocked";
-       vcstatus = UNLOCKED;
+       locker_.clear();
+       vcstatus = NOLOCKING;
+       if (checkLockMode()) {
+               if (isLocked()) {
+                       locker_ = "Locked";
+                       vcstatus = LOCKED;
+               } else {
+                       locker_ = "Unlocked";
+                       vcstatus = LOCKED;
+               }
+       }
 }
 
 

diff --git a/src/VCBackend.h b/src/VCBackend.h
index 23bb162eb5583f32ed1b0d34d0edfc85f64c9a0b..ac22f83ed1e2ef5568f22ce24d478629d3d8ae1b 100644 (file)
--- a/src/VCBackend.h
+++ b/src/VCBackend.h
@@ -27,7 +27,8 @@ public:
        /// the status of the managed file
        enum VCStatus {
                UNLOCKED,
-               LOCKED
+               LOCKED,
+               NOLOCKING
        };
 
        virtual ~VCS() {}