X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.h;h=e7dc735b99a71daf6950ba5979460135cec940e1;hb=8c67cb8c3aaa99c38e21936efaa2b41252070c6b;hp=d9839064a22dd9a849cfaad4c53f116bfa814cc0;hpb=49506153c16d6e435e993e40b7520a5ce2b2471c;p=lyx.git

diff --git a/src/VCBackend.h b/src/VCBackend.h
index d9839064a2..e7dc735b99 100644
--- a/src/VCBackend.h
+++ b/src/VCBackend.h
@@ -129,13 +129,8 @@ protected:
 	 * @param path the path from which to execute
 	 * @return exit status
 	 */
-	static int doVCCommandCall(std::string const & cmd, support::FileName const & path);
-
-	/**
-	 * The master VC file. For RCS this is *,v or RCS/ *,v. master should
-	 * have full path.
-	 */
-	support::FileName master_;
+	static int doVCCommandCall(std::string const & cmd,
+			support::FileName const & path = support::FileName());
 
 	/// The status of the VC controlled file.
 	VCStatus vcstatus_;
@@ -216,6 +211,12 @@ protected:
 	void scanMaster() override;
 private:
 	bool getRevisionInfo();
+	/**
+	 * The master VC file. For RCS this is *,v or RCS/ *,v.
+	 * master should have full path.
+	 */
+	support::FileName master_;
+
 	/**
 	 * The version of the VC file. I am not sure if this can be a
 	 * string or if it must be a float/int.
@@ -322,6 +323,11 @@ protected:
 	};
 
 private:
+	/**
+	 * The master VC file. For CVS this is CVS/Entries
+	 * master should have full path.
+	 */
+	support::FileName master_;
 	// revision number from scanMaster
 	std::string version_;
 
@@ -379,11 +385,10 @@ class SVN : public VCS {
 public:
 	///
 	explicit
-	SVN(support::FileName const & m, Buffer * b);
+	SVN(Buffer * b);
 
 	/// Determine whether the file is under SVN control
-	/// \return the file itself if so, else empty
-	static support::FileName const findFile(support::FileName const & file);
+	static bool findFile(support::FileName const & file);
 
 	/// get file from repo, the caller must ensure that it does not exist locally
 	static bool retrieve(support::FileName const & file);
@@ -490,11 +495,11 @@ class GIT : public VCS {
 public:
 	///
 	explicit
-	GIT(support::FileName const & m, Buffer * b);
+	GIT(Buffer * b);
 
-	/// Determine whether the file is under RCS control
+	/// Determine whether the file is under GIT control
 	/// \return the file itself if so, else empty
-	static support::FileName const findFile(support::FileName const & file);
+	static bool findFile(support::FileName const & file);
 
 	/// get file from repo, the caller must ensure that it does not exist locally
 	static bool retrieve(support::FileName const & file);