X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.h;h=970972af48b50db7d233d7647cfb6451dcdce21d;hb=290e7a9e09fec5ebed1df84f696b4f72b0b4cfda;hp=a888266e2f866539a581ea03ae4555d007469696;hpb=0526eb9d47008ba8d63452a32e8cdc73a272b7f1;p=lyx.git

diff --git a/src/VCBackend.h b/src/VCBackend.h
index a888266e2f..970972af48 100644
--- a/src/VCBackend.h
+++ b/src/VCBackend.h
@@ -33,9 +33,6 @@ public:
 		UNLOCKED,
 		LOCKED,
 		NOLOCKING,
-		/// This file is not in version control, but it could be aded
-		/// (because the path is under version control)
-		UNVERSIONED,
 	};
 
 	VCS(Buffer * b) : owner_(b) {}
@@ -47,6 +44,8 @@ public:
 	virtual bool renameEnabled() = 0;
 	/// rename a file. Return non-empty log on success, empty log on failure.
 	virtual std::string rename(support::FileName const &, std::string const &) = 0;
+	/// can this operation be processed in the current VCS?
+	virtual bool copyEnabled() = 0;
 	/// copy a file. Return non-empty log on success, empty log on failure.
 	virtual std::string copy(support::FileName const &, std::string const &) = 0;
 	/// check in the current revision.
@@ -103,8 +102,8 @@ public:
 	virtual bool prepareFileRevisionEnabled() = 0;
 
 	/// Check the directory of file and all parent directories
-	/// for the existence of the given pathname
-	static bool checkparentdirs(support::FileName const & file, std::string const & pathname);
+	/// for the existence of repository-info like .git or .svn
+	static bool checkparentdirs(support::FileName const & file, std::string const & vcsdir);
 	
 protected:
 	/// parse information from the version file
@@ -148,6 +147,7 @@ public:
 	/// return the revision file for the given file, if found
 	static support::FileName const 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);
 
 	virtual void registrer(std::string const & msg);
@@ -156,6 +156,8 @@ public:
 
 	virtual std::string rename(support::FileName const &, std::string const &);
 
+	virtual bool copyEnabled();
+
 	virtual std::string copy(support::FileName const &, std::string const &);
 
 	virtual LyXVC::CommandResult
@@ -229,6 +231,7 @@ public:
 	/// return the revision file for the given file, if found
 	static support::FileName const 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);
 
 	virtual void registrer(std::string const & msg);
@@ -237,6 +240,8 @@ public:
 
 	virtual std::string rename(support::FileName const &, std::string const &);
 
+	virtual bool copyEnabled();
+
 	virtual std::string copy(support::FileName const &, std::string const &);
 
 	virtual LyXVC::CommandResult
@@ -365,6 +370,7 @@ public:
 	/// return the revision file for the given file, if found
 	static support::FileName const 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);
 
 	virtual void registrer(std::string const & msg);
@@ -373,6 +379,8 @@ public:
 
 	virtual std::string rename(support::FileName const &, std::string const &);
 
+	virtual bool copyEnabled();
+
 	virtual std::string copy(support::FileName const &, std::string const &);
 
 	virtual LyXVC::CommandResult
@@ -454,6 +462,106 @@ private:
 	std::string rev_tree_cache_;
 };
 
+
+/**
+ * Very basic git support:
+ * Remote repos are completely ignored, only the local tree is considered.
+ * How push and pull could be integrated with the LyX VCS interface needs
+ * to be discussed.
+ */
+class GIT : public VCS {
+public:
+	///
+	explicit
+	GIT(support::FileName const & m, Buffer * b);
+
+	/// return the revision file for the given file, if found
+	static support::FileName const 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);
+
+	virtual void registrer(std::string const & msg);
+
+	virtual bool renameEnabled();
+
+	virtual std::string rename(support::FileName const &, std::string const &);
+
+	virtual bool copyEnabled();
+
+	virtual std::string copy(support::FileName const &, std::string const &);
+
+	virtual LyXVC::CommandResult
+	checkIn(std::string const & msg, std::string & log);
+
+	virtual bool checkInEnabled();
+
+	virtual bool isCheckInWithConfirmation();
+
+	virtual std::string checkOut();
+
+	virtual bool checkOutEnabled();
+
+	virtual std::string repoUpdate();
+
+	virtual bool repoUpdateEnabled();
+
+	virtual std::string lockingToggle();
+
+	virtual bool lockingToggleEnabled();
+
+	virtual bool revert();
+
+	virtual bool isRevertWithConfirmation();
+
+	virtual void undoLast();
+
+	virtual bool undoLastEnabled();
+
+	virtual void getLog(support::FileName const &);
+
+	virtual std::string const versionString() const {
+		return "GIT: ?";
+	}
+
+	virtual bool toggleReadOnlyEnabled();
+
+	virtual std::string revisionInfo(LyXVC::RevisionInfo const info);
+
+	virtual bool prepareFileRevision(std::string const & rev, std::string & f);
+
+	virtual bool prepareFileRevisionEnabled();
+
+protected:
+	virtual void scanMaster();
+	/// Check for messages in svn output. Returns error.
+	std::string scanLogFile(support::FileName const & f, std::string & status);
+	/// Check in files \p f with log \p msg
+	LyXVC::CommandResult checkIn(std::vector<support::FileName> const & f,
+	                             std::string const & msg, std::string & log);
+
+private:
+	/**
+	 * Real code for obtaining file revision info. Fills all file-related caches
+	 * and returns true if successfull.
+	 * "?" is stored in rev_file_cache_ as a signal if request for obtaining info
+	 * was already unsuccessful.
+	 */
+	bool getFileRevisionInfo();
+	/// cache for file revision number, "?" if already unsuccessful, isNumber==true
+	std::string rev_file_cache_;
+	/// cache for author of last commit
+	std::string rev_author_cache_;
+	/// cache for date of last commit
+	std::string rev_date_cache_;
+	/// cache for time of last commit
+	std::string rev_time_cache_;
+	/// fills rev_tree_cache_, returns true if successfull.
+	bool getTreeRevisionInfo();
+	/// cache for tree revision number, "?" if already unsuccessful
+	std::string rev_tree_cache_;
+};
+
 } // namespace lyx
 
 #endif // VCBACKEND_H