oh well

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index c487f7887a222d2f5328a23b881c16219a7f8f34..4431b6d30f67e0f43d819539375e580cad3c77aa 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -4,21 +4,22 @@
 #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 "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,15 +76,29 @@ 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() && 
+       if (!vcs->owner()->isLyxClean() &&
            Alert::askQuestion(_("Changes in document:"),
                        MakeDisplayPath(vcs->owner()->fileName(), 50),
                        _("Save document and proceed?"))) {
@@ -108,7 +123,7 @@ void LyXVC::registrer()
                           _("This document has NOT been registered."));
                return;
        }
-       
+
        vcs->registrer(tmp.second);
 }
 
@@ -116,7 +131,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 +161,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 +169,7 @@ void LyXVC::checkOut()
        }
 
        vcs->checkOut();
-       
+
 }