From: Pavel Sanda <sanda@lyx.org>
Date: Sat, 31 Jan 2009 18:01:48 +0000 (+0000)
Subject: VCS: adjust internal structure
X-Git-Tag: 2.0.0~7345
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7ff5bd4c548d6cdf815c76c05b3673ba283bdacd;p=features.git

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 6e8b565554..aed6d01268 100644
--- 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 23bb162eb5..ac22f83ed1 100644
--- 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() {}