X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXVC.cpp;h=7e7e770b10791fc9eae0c526f1c35d1db33619e3;hb=01da93521d573ca5064ab961ec7062b16bec880a;hp=b35f6aef5572d78745298a3b1d3a0215c46b40a5;hpb=ddfb49a4f0fa78e00c91fc3de1a8d9861744d8df;p=lyx.git

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index b35f6aef55..7e7e770b10 100644
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -25,6 +25,7 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/TempFile.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -36,13 +37,33 @@ namespace Alert = frontend::Alert;
 
 LyXVC::LyXVC()
 {
-	owner_ = 0;
+	owner_ = nullptr;
 }
 
 
-// for the sake of boost::scoped_ptr
-LyXVC::~LyXVC()
-{}
+docstring LyXVC::vcstatus() const
+{
+	if (!vcs_)
+		return docstring();
+	if (locking())
+		return bformat(_("%1$s lock"), from_ascii(vcs_->vcname()));
+	else
+		return from_ascii(vcs_->vcname());
+}
+
+
+bool LyXVC::fileInVC(FileName const & fn)
+{
+	if (!RCS::findFile(fn).empty())
+		return true;
+	if (!CVS::findFile(fn).empty())
+		return true;
+	if (SVN::findFile(fn))
+		return true;
+	if (GIT::findFile(fn))
+		return true;
+	return false;
+}
 
 
 bool LyXVC::file_found_hook(FileName const & fn)
@@ -50,37 +71,42 @@ bool LyXVC::file_found_hook(FileName const & fn)
 	FileName found_file;
 	// Check if file is under RCS
 	if (!(found_file = RCS::findFile(fn)).empty()) {
-		vcs.reset(new RCS(found_file));
-		vcs->owner(owner_);
+		vcs_.reset(new RCS(found_file, owner_));
 		return true;
 	}
 	// Check if file is under CVS
 	if (!(found_file = CVS::findFile(fn)).empty()) {
-		vcs.reset(new CVS(found_file, fn));
-		vcs->owner(owner_);
+		vcs_.reset(new CVS(found_file, owner_));
 		return true;
 	}
 	// Check if file is under SVN
-	if (!(found_file = SVN::findFile(fn)).empty()) {
-		vcs.reset(new SVN(found_file, fn));
-		vcs->owner(owner_);
+	if (SVN::findFile(fn)) {
+		vcs_.reset(new SVN(owner_));
+		return true;
+	}
+	// Check if file is under GIT
+	if (GIT::findFile(fn)) {
+		vcs_.reset(new GIT(owner_));
 		return true;
 	}
 
 	// file is not under any VCS.
+	vcs_.reset(nullptr);
 	return false;
 }
 
 
 bool LyXVC::file_not_found_hook(FileName const & fn)
 {
-	// Check if file is under RCS.
-	// This happens if we are trying to load non existent
-	// file on disk, but existent in ,v version.
-	// Seems there is no reasonable scenario for adding implementation
-	// of retrieve for cvs or svn.
-	if (!RCS::findFile(fn).empty()) {	
-		docstring const file = makeDisplayPath(fn.absFilename(), 20);
+	// Check if file is under version control.
+	// This happens if we are trying to load file that does not exist.
+	// It may yet exist in the repository and so could be checked out.
+	bool foundRCS = !RCS::findFile(fn).empty();
+	bool foundCVS = foundRCS ? false : !CVS::findFile(fn).empty();
+	bool foundSVN = (foundRCS || foundCVS) ? false : SVN::findFile(fn);
+	bool foundGIT = (foundRCS || foundCVS || foundSVN) ? false : GIT::findFile(fn);
+	if (foundRCS || foundCVS || foundSVN || foundGIT) {
+		docstring const file = makeDisplayPath(fn.absFileName(), 20);
 		docstring const text =
 			bformat(_("Do you want to retrieve the document"
 						   " %1$s from version control?"), file);
@@ -88,11 +114,19 @@ bool LyXVC::file_not_found_hook(FileName const & fn)
 			text, 0, 1, _("&Retrieve"), _("&Cancel"));
 
 		if (ret == 0) {
-			// How can we know _how_ to do the checkout?
-			// With the current VC support it has to be an RCS
-			// file since CVS and SVN do not have special ,v files.
-			RCS::retrieve(fn);
-			return true;
+			// Since the retrieve commands are implemented using
+			// more general update commands we need to ensure that
+			// we do not change an existing file by accident.
+			if (fn.exists())
+				return false;
+			if (foundRCS)
+				return RCS::retrieve(fn);
+			else if (foundCVS)
+				return CVS::retrieve(fn);
+			else if (foundSVN)
+				return SVN::retrieve(fn);
+			else
+				return GIT::retrieve(fn);
 		}
 	}
 	return false;
@@ -118,28 +152,38 @@ bool LyXVC::registrer()
 	}
 
 	// it is very likely here that the vcs is not created yet...
-	if (!vcs) {
-		//check in the root directory of the document
-		FileName const cvs_entries(onlyPath(filename.absFilename()) + "/CVS/Entries");
-		FileName const svn_entries(onlyPath(filename.absFilename()) + "/.svn/entries");
-
-		if (svn_entries.isReadableFile()) {
-			LYXERR(Debug::LYXVC, "LyXVC: registering "
-				<< to_utf8(filename.displayName()) << " with SVN");
-			vcs.reset(new SVN(cvs_entries, filename));
+	if (!vcs_) {
+		FileName found = VCS::checkParentDirs(filename, ".git/index");
 
-		} else if (cvs_entries.isReadableFile()) {
+		if (!found.empty()) {
 			LYXERR(Debug::LYXVC, "LyXVC: registering "
-				<< to_utf8(filename.displayName()) << " with CVS");
-			vcs.reset(new CVS(cvs_entries, filename));
+				<< to_utf8(filename.displayName()) << " with GIT");
+			vcs_.reset(new GIT(owner_));
 
 		} else {
-			LYXERR(Debug::LYXVC, "LyXVC: registering "
-				<< to_utf8(filename.displayName()) << " with RCS");
-			vcs.reset(new RCS(FileName()));
+			found = VCS::checkParentDirs(filename, ".svn/entries");
+			if (!found.empty()) {
+				LYXERR(Debug::LYXVC, "LyXVC: registering "
+					<< to_utf8(filename.displayName()) << " with SVN");
+				vcs_.reset(new SVN(owner_));
+
+			} else {
+				// We only need to check the current directory, since CVS meta-data
+				// is in every sub-directory.
+				FileName const cvs_entries(onlyPath(filename.absFileName()) + "/CVS/Entries");
+				if (cvs_entries.isReadableFile()) {
+					LYXERR(Debug::LYXVC, "LyXVC: registering "
+						<< to_utf8(filename.displayName()) << " with CVS");
+					vcs_.reset(new CVS(cvs_entries, owner_));
+
+				} else {
+					// If all else fails, use RCS
+					LYXERR(Debug::LYXVC, "LyXVC: registering "
+						<< to_utf8(filename.displayName()) << " with RCS");
+					vcs_.reset(new RCS(FileName(), owner_));
+				}
+			}
 		}
-
-		vcs->owner(owner_);
 	}
 
 	LYXERR(Debug::LYXVC, "LyXVC: registrer");
@@ -148,167 +192,276 @@ bool LyXVC::registrer()
 			_("(no initial description)"));
 	if (!ok) {
 		LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
+		vcs_.reset(nullptr);
 		return false;
 	}
 	if (response.empty())
 		response = _("(no initial description)");
-	vcs->registrer(to_utf8(response));
+	vcs_->registrer(to_utf8(response));
 	return true;
 }
 
 
-string LyXVC::checkIn()
+string LyXVC::rename(FileName const & fn)
+{
+	LYXERR(Debug::LYXVC, "LyXVC: rename");
+	if (!vcs_ || fileInVC(fn))
+		return string();
+	docstring response;
+	bool ok = Alert::askForText(response, _("LyX VC: Log message"),
+			_("(no log message)"));
+	if (!ok) {
+		LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
+		return string();
+	}
+	if (response.empty())
+		response = _("(no log message)");
+	string ret = vcs_->rename(fn, to_utf8(response));
+	return ret;
+}
+
+
+string LyXVC::copy(FileName const & fn)
+{
+	LYXERR(Debug::LYXVC, "LyXVC: copy");
+	if (!vcs_ || fileInVC(fn))
+		return string();
+	docstring response;
+	bool ok = Alert::askForText(response, _("LyX VC: Log message"),
+			_("(no log message)"));
+	if (!ok) {
+		LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
+		return string();
+	}
+	if (response.empty())
+		response = _("(no log message)");
+	string ret = vcs_->copy(fn, to_utf8(response));
+	return ret;
+}
+
+
+LyXVC::CommandResult LyXVC::checkIn(string & log)
 {
 	LYXERR(Debug::LYXVC, "LyXVC: checkIn");
+	if (!vcs_)
+		return ErrorBefore;
 	docstring empty(_("(no log message)"));
 	docstring response;
-	string log;
-	bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
+	bool ok = true;
+	if (vcs_->isCheckInWithConfirmation())
+		ok = Alert::askForText(response, _("LyX VC: Log Message"));
 	if (ok) {
 		if (response.empty())
 			response = empty;
-		log = vcs->checkIn(to_utf8(response));
-
-		// Reserve empty string for cancel button
-		if (log.empty())
-			log = to_utf8(empty);
+		//shell collisions
+		response = subst(response, from_ascii("\""), from_ascii("\\\""));
+		return vcs_->checkIn(to_utf8(response), log);
 	} else {
 		LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
+		return Cancelled;
 	}
-	return log;
 }
 
 
 string LyXVC::checkOut()
 {
+	if (!vcs_)
+		return string();
 	//RCS allows checkOut only in ReadOnly mode
-	if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
+	if (vcs_->toggleReadOnlyEnabled() && !owner_->hasReadonlyFlag())
+		return string();
 
 	LYXERR(Debug::LYXVC, "LyXVC: checkOut");
-	return vcs->checkOut();
+	return vcs_->checkOut();
 }
 
 
 string LyXVC::repoUpdate()
 {
 	LYXERR(Debug::LYXVC, "LyXVC: repoUpdate");
-	return vcs->repoUpdate();
+	if (!vcs_)
+		return string();
+	return vcs_->repoUpdate();
 }
 
 
 string LyXVC::lockingToggle()
 {
 	LYXERR(Debug::LYXVC, "LyXVC: toggle locking property");
-	return vcs->lockingToggle();
+	if (!vcs_)
+		return string();
+	return vcs_->lockingToggle();
 }
 
 
-void LyXVC::revert()
+bool LyXVC::revert()
 {
 	LYXERR(Debug::LYXVC, "LyXVC: revert");
+	if (!vcs_)
+		return false;
 
 	docstring const file = owner_->fileName().displayName(20);
 	docstring text = bformat(_("Reverting to the stored version of the "
 				"document %1$s will lose all current changes.\n\n"
 				"Do you want to revert to the older version?"), file);
-	int const ret = Alert::prompt(_("Revert to stored version of document?"),
-		text, 0, 1, _("&Revert"), _("&Cancel"));
+	int ret = 0;
+	if (vcs_->isRevertWithConfirmation())
+		ret = Alert::prompt(_("Revert to stored version of document?"),
+			text, 0, 1, _("&Revert"), _("&Cancel"));
 
-	if (ret == 0)
-		vcs->revert();
+	return ret == 0 && vcs_->revert();
 }
 
 
 void LyXVC::undoLast()
 {
-	vcs->undoLast();
+	if (!vcs_)
+		return;
+	vcs_->undoLast();
 }
 
 
-void LyXVC::toggleReadOnly()
+string LyXVC::toggleReadOnly()
 {
-	if (!vcs->toggleReadOnlyEnabled())
-		return;
+	if (!vcs_)
+		return string();
+	if (!vcs_->toggleReadOnlyEnabled())
+		return string();
 
-	switch (vcs->status()) {
+	switch (vcs_->status()) {
 	case VCS::UNLOCKED:
 		LYXERR(Debug::LYXVC, "LyXVC: toggle to locked");
-		checkOut();
-		break;
-	case VCS::LOCKED:
+		return checkOut();
+	case VCS::LOCKED: {
 		LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked");
-		checkIn();
-		break;
+		string log;
+		if (checkIn(log) != VCSuccess)
+			return string();
+		return log;
+	}
 	case VCS::NOLOCKING:
-		break;
+		Buffer * b = vcs_->owner();
+		bool const newstate = !b->hasReadonlyFlag();
+		string result = "LyXVC: toggle to ";
+		result += (newstate ? "readonly" : "readwrite");
+		LYXERR(Debug::LYXVC, result);
+		b->setReadonly(newstate);
+		return result;
 	}
+	return string();
 }
 
 
 bool LyXVC::inUse() const
 {
-	if (vcs)
-		return true;
-	return false;
+	return vcs_ != nullptr;
 }
 
 
-//string const & LyXVC::version() const
-//{
-//	return vcs->version();
-//}
-
-
 string const LyXVC::versionString() const
 {
-	return vcs->versionString();
+	if (!vcs_)
+		return string();
+	return vcs_->versionString();
 }
 
 
-string const & LyXVC::locker() const
+bool LyXVC::locking() const
 {
-	return vcs->locker();
+	if (!vcs_)
+		return false;
+	return vcs_->status() != VCS::NOLOCKING;
 }
 
 
 string const LyXVC::getLogFile() const
 {
-	if (!vcs)
+	if (!vcs_)
 		return string();
 
-	FileName const tmpf = FileName::tempName("lyxvclog");
+	TempFile tempfile("lyxvclog");
+	tempfile.setAutoRemove(false);
+	FileName const tmpf = tempfile.name();
 	if (tmpf.empty()) {
 		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
 		return string();
 	}
 	LYXERR(Debug::LYXVC, "Generating logfile " << tmpf);
-	vcs->getLog(tmpf);
-	return tmpf.absFilename();
+	vcs_->getLog(tmpf);
+	return tmpf.absFileName();
+}
+
+
+string LyXVC::revisionInfo(RevisionInfo const info) const
+{
+	if (!vcs_)
+		return string();
+
+	return vcs_->revisionInfo(info);
+}
+
+
+bool LyXVC::renameEnabled() const
+{
+	if (!inUse())
+		return false;
+	return vcs_->renameEnabled();
+}
+
+
+bool LyXVC::copyEnabled() const
+{
+	if (!inUse())
+		return false;
+	return vcs_->copyEnabled();
 }
 
 
 bool LyXVC::checkOutEnabled() const
 {
-	return vcs && vcs->checkOutEnabled();
+	return vcs_ && vcs_->checkOutEnabled();
 }
 
 
 bool LyXVC::checkInEnabled() const
 {
-	return vcs && vcs->checkInEnabled();
+	return vcs_ && vcs_->checkInEnabled();
+}
+
+
+bool LyXVC::isCheckInWithConfirmation() const
+{
+	return vcs_ && vcs_->isCheckInWithConfirmation();
 }
 
 
 bool LyXVC::lockingToggleEnabled() const
 {
-	return vcs && vcs->lockingToggleEnabled();
+	return vcs_ && vcs_->lockingToggleEnabled();
 }
 
 
 bool LyXVC::undoLastEnabled() const
 {
-	return vcs && vcs->undoLastEnabled();
+	return vcs_ && vcs_->undoLastEnabled();
 }
 
 
+bool LyXVC::repoUpdateEnabled() const
+{
+	return vcs_ && vcs_->repoUpdateEnabled();
+}
+
+
+bool LyXVC::prepareFileRevision(string const & rev, std::string & f)
+{
+	return vcs_ && vcs_->prepareFileRevision(rev, f);
+}
+
+
+bool LyXVC::prepareFileRevisionEnabled()
+{
+	return vcs_ && vcs_->prepareFileRevisionEnabled();
+}
+
 } // namespace lyx