redraw fix 1.

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index c487f7887a222d2f5328a23b881c16219a7f8f34..a181ec96b4da783e6e44bc9ce16eef974a93c51e 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -4,20 +4,21 @@
 #pragma implementation
 #endif
 
-#include <unistd.h>
-
-#include "frontends/Alert.h"
 #include "lyxvc.h"
 #include "vc-backend.h"
 #include "debug.h"
-#include "lyx_gui_misc.h"
 #include "buffer.h"
 #include "BufferView.h"
+#include "lyxfunc.h"
 #include "gettext.h"
+
+#include "frontends/Alert.h"
+#include "frontends/LyXView.h"
+
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
+
+#include <unistd.h>
 
 using std::endl;
 using std::pair;
@@ -74,18 +75,42 @@ void LyXVC::buffer(Buffer * buf)
 
 void LyXVC::registrer()
 {
+       string const filename = owner_->fileName();
+ 
+       // there must be a file to save
+       if (!IsFileReadable(filename)) {
+               Alert::alert(_("File not saved"),
+                       _("You must save the file"),
+                       _("before it can be registered."));
+               return;
+       }
+
        // 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(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_);
        }
-       
+
        // If the document is changed, we might want to save it
-       if (!vcs->owner()->isLyxClean() && 
+       if (!vcs->owner()->isLyxClean() &&
            Alert::askQuestion(_("Changes in document:"),
-                       MakeDisplayPath(vcs->owner()->fileName(), 50),
+                       MakeDisplayPath(filename, 50),
                        _("Save document and proceed?"))) {
                vcs->owner()->getUser()->owner()
                        ->getLyXFunc()->dispatch(LFUN_MENUWRITE);
@@ -108,7 +133,7 @@ void LyXVC::registrer()
                           _("This document has NOT been registered."));
                return;
        }
-       
+
        vcs->registrer(tmp.second);
 }
 
@@ -116,7 +141,7 @@ void LyXVC::registrer()
 void LyXVC::checkIn()
 {
        // If the document is changed, we might want to save it
-       if (!vcs->owner()->isLyxClean() && 
+       if (!vcs->owner()->isLyxClean() &&
            Alert::askQuestion(_("Changes in document:"),
                        MakeDisplayPath(vcs->owner()->fileName(), 50),
                        _("Save document and proceed?"))) {
@@ -146,7 +171,7 @@ void LyXVC::checkIn()
 void LyXVC::checkOut()
 {
        lyxerr[Debug::LYXVC] << "LyXVC: checkOut" << endl;
-       if (!vcs->owner()->isLyxClean() 
+       if (!vcs->owner()->isLyxClean()
            && !Alert::askQuestion(_("Changes in document:"),
                           MakeDisplayPath(vcs->owner()->fileName(), 50),
                           _("Ignore changes and proceed with check out?"))) {
@@ -154,7 +179,7 @@ void LyXVC::checkOut()
        }
 
        vcs->checkOut();
-       
+
 }