X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxvc.C;h=4431b6d30f67e0f43d819539375e580cad3c77aa;hb=27290f151b160dd4763a41976af3451755cd03cf;hp=b921cfb0427c7d118e2c5ba99532763dbe3423a9;hpb=d1182f17daa1a164d9527ccbe6500840d7ac6bc8;p=lyx.git

diff --git a/src/lyxvc.C b/src/lyxvc.C
index b921cfb042..4431b6d30f 100644
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -4,21 +4,22 @@
 #pragma implementation
 #endif
 
-#include <unistd.h>
-
-#include FORMS_H_LOCATION
 #include "lyxvc.h"
 #include "vc-backend.h"
 #include "debug.h"
-#include "lyx_gui_misc.h"
 #include "buffer.h"
 #include "BufferView.h"
 #include "gettext.h"
-#include "support/filetools.h"
-#include "support/lyxlib.h"
 #include "LyXView.h"
 #include "lyxfunc.h"
 
+#include "frontends/Alert.h"
+
+#include "support/filetools.h"
+#include "support/lyxlib.h"
+
+#include <unistd.h>
+
 using std::endl;
 using std::pair;
 
@@ -75,20 +76,34 @@ void LyXVC::buffer(Buffer * buf)
 void LyXVC::registrer()
 {
 	// it is very likely here that the vcs is not created yet...
-	// so... we use RCS as default, later this should perhaps be
-	// a lyxrc option.
 	if (!vcs) {
-		vcs = new RCS(owner_->fileName());
+		string const cvs_entries = "CVS/Entries";
+
+		if (IsFileReadable(cvs_entries)) {
+			lyxerr[Debug::LYXVC]
+				<< "LyXVC: registering "
+				<< MakeDisplayPath(owner_->fileName())
+				<< " with CVS" << endl;
+			vcs = new CVS(cvs_entries, owner_->fileName());
+
+		} else {
+			lyxerr[Debug::LYXVC]
+				<< "LyXVC: registering "
+				<< MakeDisplayPath(owner_->fileName())
+				<< " with RCS" << endl;
+			vcs = new RCS(owner_->fileName());
+		}
+
 		vcs->owner(owner_);
 	}
-	
+
 	// If the document is changed, we might want to save it
-	if (!vcs->owner()->isLyxClean() && 
-	    AskQuestion(_("Changes in document:"),
+	if (!vcs->owner()->isLyxClean() &&
+	    Alert::askQuestion(_("Changes in document:"),
 			MakeDisplayPath(vcs->owner()->fileName(), 50),
 			_("Save document and proceed?"))) {
 		vcs->owner()->getUser()->owner()
-			->getLyXFunc()->Dispatch(LFUN_MENUWRITE);
+			->getLyXFunc()->dispatch(LFUN_MENUWRITE);
 	}
 
 	// Maybe the save fails, or we answered "no". In both cases,
@@ -99,16 +114,16 @@ void LyXVC::registrer()
 
 	lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
 	pair<bool, string> tmp =
-		askForText(_("LyX VC: Initial description"),
+		Alert::askForText(_("LyX VC: Initial description"),
 			   _("(no initial description)"));
 	if (!tmp.first || tmp.second.empty()) {
 		// should we insist on checking tmp.second.empty()?
 		lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
-		WriteAlert(_("Info"),
+		Alert::alert(_("Info"),
 			   _("This document has NOT been registered."));
 		return;
 	}
-	
+
 	vcs->registrer(tmp.second);
 }
 
@@ -116,12 +131,12 @@ void LyXVC::registrer()
 void LyXVC::checkIn()
 {
 	// If the document is changed, we might want to save it
-	if (!vcs->owner()->isLyxClean() && 
-	    AskQuestion(_("Changes in document:"),
+	if (!vcs->owner()->isLyxClean() &&
+	    Alert::askQuestion(_("Changes in document:"),
 			MakeDisplayPath(vcs->owner()->fileName(), 50),
 			_("Save document and proceed?"))) {
 		vcs->owner()->getUser()->owner()
-			->getLyXFunc()->Dispatch(LFUN_MENUWRITE);
+			->getLyXFunc()->dispatch(LFUN_MENUWRITE);
 	}
 
 	// Maybe the save fails, or we answered "no". In both cases,
@@ -131,7 +146,7 @@ void LyXVC::checkIn()
 	}
 
 	lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl;
-	pair<bool, string> tmp = askForText(_("LyX VC: Log Message"));
+	pair<bool, string> tmp = Alert::askForText(_("LyX VC: Log Message"));
 	if (tmp.first) {
 		if (tmp.second.empty()) {
 			tmp.second = _("(no log message)");
@@ -146,15 +161,15 @@ void LyXVC::checkIn()
 void LyXVC::checkOut()
 {
 	lyxerr[Debug::LYXVC] << "LyXVC: checkOut" << endl;
-	if (!vcs->owner()->isLyxClean() 
-	    && !AskQuestion(_("Changes in document:"),
+	if (!vcs->owner()->isLyxClean()
+	    && !Alert::askQuestion(_("Changes in document:"),
 			   MakeDisplayPath(vcs->owner()->fileName(), 50),
 			   _("Ignore changes and proceed with check out?"))) {
 		return;
 	}
 
 	vcs->checkOut();
-	
+
 }
 
 
@@ -164,7 +179,7 @@ void LyXVC::revert()
 	// Here we should check if the buffer is dirty. And if it is
 	// we should warn the user that reverting will discard all
 	// changes made since the last check in.
-	if (AskQuestion(_("When you revert, you will loose all changes made"),
+	if (Alert::askQuestion(_("When you revert, you will loose all changes made"),
 			_("to the document since the last check in."),
 			_("Do you still want to do it?"))) {
 
@@ -201,9 +216,14 @@ bool LyXVC::inUse()
 }
 
 
-string const & LyXVC::version() const
+//string const & LyXVC::version() const
+//{
+//	return vcs->version();
+//}
+
+string const LyXVC::versionString() const
 {
-	return vcs->version();
+	return vcs->versionString();
 }