X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxvc.C;h=b4dae54556863c0f6b2f3f09777dbe6c71a4855c;hb=78046794ccfce3a20751e00b35295c290853afd6;hp=38d9278dd793f627af57e426f1c386313bda761b;hpb=28a9daa060e51a835f651d17b7424f6096f6a1a4;p=lyx.git

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 38d9278dd7..b4dae54556 100644
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -1,28 +1,41 @@
-#include <config.h>
+/**
+ * \file lyxvc.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Allan Rae
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "lyxvc.h"
 #include "vc-backend.h"
 #include "debug.h"
 #include "buffer.h"
-#include "BufferView.h"
 #include "gettext.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
 
 #include "frontends/Alert.h"
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 
-#include <unistd.h>
+using lyx::support::bformat;
+using lyx::support::IsFileReadable;
+using lyx::support::MakeDisplayPath;
+using lyx::support::tempName;
 
 using std::endl;
+using std::string;
 using std::pair;
 
+
 LyXVC::LyXVC()
 {
 	vcs = 0;
@@ -75,27 +88,36 @@ 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());
-		vcs->owner(owner_);
-	}
+	string const filename = owner_->fileName();
 
-	// If the document is changed, we might want to save it
-	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);
+	// there must be a file to save
+	if (!IsFileReadable(filename)) {
+		Alert::error(_("Document not saved"),
+			     _("You must save the document "
+			       "before it can be registered."));
+		return;
 	}
 
-	// Maybe the save fails, or we answered "no". In both cases,
-	// the document will be dirty, and we abort.
-	if (!vcs->owner()->isLyxClean()) {
-		return;
+	// it is very likely here that the vcs is not created yet...
+	if (!vcs) {
+		string const cvs_entries = "CVS/Entries";
+
+		if (IsFileReadable(cvs_entries)) {
+			lyxerr[Debug::LYXVC]
+				<< "LyXVC: registering "
+				<< MakeDisplayPath(filename)
+				<< " with CVS" << endl;
+			vcs = new CVS(cvs_entries, filename);
+
+		} else {
+			lyxerr[Debug::LYXVC]
+				<< "LyXVC: registering "
+				<< MakeDisplayPath(filename)
+				<< " with RCS" << endl;
+			vcs = new RCS(filename);
+		}
+
+		vcs->owner(owner_);
 	}
 
 	lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
@@ -105,8 +127,6 @@ void LyXVC::registrer()
 	if (!tmp.first || tmp.second.empty()) {
 		// should we insist on checking tmp.second.empty()?
 		lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
-		Alert::alert(_("Info"),
-			   _("This document has NOT been registered."));
 		return;
 	}
 
@@ -116,20 +136,6 @@ void LyXVC::registrer()
 
 void LyXVC::checkIn()
 {
-	// If the document is changed, we might want to save it
-	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);
-	}
-
-	// Maybe the save fails, or we answered "no". In both cases,
-	// the document will be dirty, and we abort.
-	if (!vcs->owner()->isLyxClean()) {
-		return;
-	}
 
 	lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl;
 	pair<bool, string> tmp = Alert::askForText(_("LyX VC: Log Message"));
@@ -147,30 +153,24 @@ void LyXVC::checkIn()
 void LyXVC::checkOut()
 {
 	lyxerr[Debug::LYXVC] << "LyXVC: checkOut" << endl;
-	if (!vcs->owner()->isLyxClean()
-	    && !Alert::askQuestion(_("Changes in document:"),
-			   MakeDisplayPath(vcs->owner()->fileName(), 50),
-			   _("Ignore changes and proceed with check out?"))) {
-		return;
-	}
 
 	vcs->checkOut();
-
 }
 
 
 void LyXVC::revert()
 {
 	lyxerr[Debug::LYXVC] << "LyXVC: revert" << endl;
-	// 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 (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?"))) {
 
+	string const file = MakeDisplayPath(owner_->fileName(), 20);
+	string 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 saved version?"), file);
+	int const ret = Alert::prompt(_("Revert to stored version of document?"),
+		text, 0, 1, _("&Revert"), _("&Cancel"));
+
+	if (ret == 0)
 		vcs->revert();
-	}
 }
 
 
@@ -219,12 +219,12 @@ string const & LyXVC::locker() const
 }
 
 
-const string LyXVC::getLogFile() const
+string const LyXVC::getLogFile() const
 {
 	if (!vcs)
 		return string();
 
-	string tmpf = lyx::tempName(string(), "lyxvclog");
+	string tmpf = tempName(string(), "lyxvclog");
 	lyxerr[Debug::LYXVC] << "Generating logfile " << tmpf << endl;
 	vcs->getLog(tmpf);
 	return tmpf;