X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=3ea462439999a3e84256491a4e9614dbd5a1afcc;hb=a8572c1358d5d2e66612e9f44329a6ffd33516a6;hp=957c69f585b48890ed38fdcfa1730da82f1dbf4c;hpb=8c24070c8529166f616747e966cdd9afd735ff9e;p=lyx.git

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 957c69f585..3ea4624399 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -734,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;
 		}
 	}
@@ -969,7 +971,7 @@ string CVS::repoUpdate()
 			dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
 			ret = frontend::Alert::prompt(_("Changes detected"),
 				text, 0, 1, _("&Continue"), _("&Abort"));
-			hideDialogs("file", 0);
+			hideDialogs("file", nullptr);
 		}
 		if (ret == 1)
 			return string();
@@ -1530,7 +1532,7 @@ string SVN::repoUpdate()
 			dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
 			ret = frontend::Alert::prompt(_("Changes detected"),
 				text, 0, 1, _("&Yes"), _("&No"));
-			hideDialogs("file", 0);
+			hideDialogs("file", nullptr);
 		}
 		if (ret == 1)
 			return string();
@@ -2123,14 +2125,20 @@ 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:
@@ -2154,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()));
 
@@ -2165,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) {
@@ -2188,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;