X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=42fd36be318c17358fb5cb8f7b87198cede63a93;hb=4ddc9e2501400f8bdc35d4d1fe56f39c49e82115;hp=9f9a3ff082ecce8d89473f46ce23c347721df58a;hpb=a4e7114d985640bfc5a8305d87fa7c04b18f6708;p=lyx.git

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 9f9a3ff082..42fd36be31 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -31,6 +31,7 @@
 #include "support/TempFile.h"
 
 #include <fstream>
+#include <iomanip>
 #include <sstream>
 
 using namespace std;
@@ -170,6 +171,8 @@ void RCS::scanMaster()
 	LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster: " << master_);
 
 	ifstream ifs(master_.toFilesystemEncoding().c_str());
+	// limit the size of strings we read to avoid memory problems
+	ifs >> setw(65636);
 
 	string token;
 	bool read_enough = false;
@@ -284,7 +287,7 @@ LyXVC::CommandResult RCS::checkIn(string const & msg, string & log)
 
 bool RCS::checkInEnabled()
 {
-	return owner_ && !owner_->isReadonly();
+	return owner_ && !owner_->hasReadonlyFlag();
 }
 
 
@@ -326,7 +329,7 @@ string RCS::checkOut()
 
 bool RCS::checkOutEnabled()
 {
-	return owner_ && owner_->isReadonly();
+	return owner_ && owner_->hasReadonlyFlag();
 }
 
 
@@ -389,7 +392,7 @@ void RCS::undoLast()
 
 bool RCS::undoLastEnabled()
 {
-	return true;
+	return owner_->hasReadonlyFlag();
 }
 
 
@@ -427,7 +430,8 @@ string RCS::revisionInfo(LyXVC::RevisionInfo const info)
 			return rev_date_cache_;
 		case LyXVC::Time:
 			return rev_time_cache_;
-		default: ;
+		default:
+			break;
 	}
 
 	return string();
@@ -566,10 +570,10 @@ void CVS::scanMaster()
 		if (contains(line, tmpf)) {
 			// Ok extract the fields.
 			smatch sm;
-
-			// false positive from coverity
-			// coverity[CHECKED_RETURN]
-			regex_match(line, sm, reg);
+			if (!regex_match(line, sm, reg)) {
+				LYXERR(Debug::LYXVC, "\t  Cannot parse line. Skipping.");
+				continue;
+			}
 
 			//sm[0]; // whole matched string
 			//sm[1]; // filename
@@ -730,12 +734,14 @@ void CVS::getRevisionInfo()
 		LYXERR(Debug::LYXVC, line << '\n');
 		if (prefixIs(line, "date:")) {
 			smatch sm;
-			regex_match(line, sm, reg);
-			//sm[0]; // whole matched string
-			rev_date_cache_ = sm[1];
-			rev_time_cache_ = sm[2];
-			//sm[3]; // GMT offset
-			rev_author_cache_ = sm[4];
+			if (regex_match(line, sm, reg)) {
+			  //sm[0]; // whole matched string
+			  rev_date_cache_ = sm[1];
+			  rev_time_cache_ = sm[2];
+			  //sm[3]; // GMT offset
+			  rev_author_cache_ = sm[4];
+			} else
+			  LYXERR(Debug::LYXVC, "\tCannot parse line. Skipping."); 
 			break;
 		}
 	}
@@ -1099,7 +1105,8 @@ string CVS::revisionInfo(LyXVC::RevisionInfo const info)
 			return rev_date_cache_;
 		case LyXVC::Time:
 			return rev_time_cache_;
-		default: ;
+		default:
+			break;
 		}
 	}
 	return string();
@@ -1663,8 +1670,8 @@ string SVN::revisionInfo(LyXVC::RevisionInfo const info)
 			return rev_date_cache_;
 		case LyXVC::Time:
 			return rev_time_cache_;
-		default: ;
-
+		default:
+			break;
 	}
 
 	return string();
@@ -2118,22 +2125,28 @@ string GIT::revisionInfo(LyXVC::RevisionInfo const info)
 
 	// fill the rest of the attributes for a single file
 	if (rev_file_cache_.empty())
-		if (!getFileRevisionInfo())
+		if (!getFileRevisionInfo()) {
 			rev_file_cache_ = "?";
+			rev_file_abbrev_cache_ = "?";
+    }
 
 	switch (info) {
 		case LyXVC::File:
 			if (rev_file_cache_ == "?")
 				return string();
 			return rev_file_cache_;
+		case LyXVC::FileAbbrev:
+			if (rev_file_abbrev_cache_ == "?")
+				return string();
+			return rev_file_abbrev_cache_;
 		case LyXVC::Author:
 			return rev_author_cache_;
 		case LyXVC::Date:
 			return rev_date_cache_;
 		case LyXVC::Time:
 			return rev_time_cache_;
-		default: ;
-
+		default:
+			break;
 	}
 
 	return string();
@@ -2149,7 +2162,7 @@ bool GIT::getFileRevisionInfo()
 		return false;
 	}
 
-	doVCCommand("git log -n 1 --pretty=format:%H%n%an%n%ai " + quoteName(onlyFileName(owner_->absFileName()))
+	doVCCommand("git log -n 1 --pretty=format:%H%n%h%n%an%n%ai " + quoteName(onlyFileName(owner_->absFileName()))
 		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		    FileName(owner_->filePath()));
 
@@ -2160,6 +2173,8 @@ bool GIT::getFileRevisionInfo()
 
 	if (ifs)
 		getline(ifs, rev_file_cache_);
+	if (ifs)
+		getline(ifs, rev_file_abbrev_cache_);
 	if (ifs)
 		getline(ifs, rev_author_cache_);
 	if (ifs) {
@@ -2183,7 +2198,8 @@ bool GIT::getTreeRevisionInfo()
 	}
 
 	doVCCommand("git describe --abbrev --dirty --long > " + quoteName(tmpf.toFilesystemEncoding()),
-		    FileName(owner_->filePath()));
+		    FileName(owner_->filePath()),
+		    false); //git describe returns $?=128 when no tag found (but git repo still exists)
 
 	if (tmpf.empty())
 		return false;