#include "LyXVC.h"
#include "VCBackend.h"
-#include "debug.h"
#include "Buffer.h"
-#include "gettext.h"
#include "frontends/alert.h"
+#include "support/debug.h"
#include "support/filetools.h"
-#include "support/lyxlib.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::bformat;
-using support::FileName;
-using support::makeAbsPath;
-using support::tempName;
-
-using std::endl;
-using std::string;
-using std::pair;
-
namespace Alert = frontend::Alert;
{
FileName found_file;
// Check if file is under RCS
- if (!(found_file = RCS::find_file(fn)).empty()) {
+ if (!(found_file = RCS::findFile(fn)).empty()) {
vcs.reset(new RCS(found_file));
vcs->owner(owner_);
return true;
}
// Check if file is under CVS
- if (!(found_file = CVS::find_file(fn)).empty()) {
+ if (!(found_file = CVS::findFile(fn)).empty()) {
vcs.reset(new CVS(found_file, fn));
vcs->owner(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_);
+ return true;
+ }
+
// file is not under any VCS.
return false;
}
bool LyXVC::file_not_found_hook(FileName const & fn)
{
- // Check if file is under RCS
- if (!RCS::find_file(fn).empty())
- return true;
- if (!CVS::find_file(fn).empty())
+ // 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())
return true;
return false;
}
FileName const filename = owner_->fileName();
// there must be a file to save
- if (!filename.isFileReadable()) {
+ if (!filename.isReadableFile()) {
Alert::error(_("Document not saved"),
_("You must save the document "
"before it can be registered."));
// it is very likely here that the vcs is not created yet...
if (!vcs) {
- FileName const cvs_entries(makeAbsPath("CVS/Entries"));
-
- if (cvs_entries.isFileReadable()) {
- LYXERR(Debug::LYXVC)
- << "LyXVC: registering "
- << to_utf8(filename.displayName())
- << " with CVS" << endl;
+ //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));
+
+ } else if (cvs_entries.isReadableFile()) {
+ LYXERR(Debug::LYXVC, "LyXVC: registering "
+ << to_utf8(filename.displayName()) << " with CVS");
vcs.reset(new CVS(cvs_entries, filename));
} else {
- LYXERR(Debug::LYXVC)
- << "LyXVC: registering "
- << to_utf8(filename.displayName())
- << " with RCS" << endl;
+ LYXERR(Debug::LYXVC, "LyXVC: registering "
+ << to_utf8(filename.displayName()) << " with RCS");
vcs.reset(new RCS(filename));
}
vcs->owner(owner_);
}
- LYXERR(Debug::LYXVC) << "LyXVC: registrer" << endl;
+ LYXERR(Debug::LYXVC, "LyXVC: registrer");
docstring response;
bool ok = Alert::askForText(response, _("LyX VC: Initial description"),
_("(no initial description)"));
if (!ok || response.empty()) {
// should we insist on checking response.empty()?
- LYXERR(Debug::LYXVC) << "LyXVC: user cancelled" << endl;
+ LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
return;
}
}
-void LyXVC::checkIn()
+string LyXVC::checkIn()
{
-
- LYXERR(Debug::LYXVC) << "LyXVC: checkIn" << endl;
+ LYXERR(Debug::LYXVC, "LyXVC: checkIn");
docstring response;
+ string log;
bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
if (ok) {
if (response.empty())
response = _("(no log message)");
- vcs->checkIn(to_utf8(response));
+ log = vcs->checkIn(to_utf8(response));
} else {
- LYXERR(Debug::LYXVC) << "LyXVC: user cancelled" << endl;
+ LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
}
+ return log;
}
-void LyXVC::checkOut()
+string LyXVC::checkOut()
{
- LYXERR(Debug::LYXVC) << "LyXVC: checkOut" << endl;
+ //RCS allows checkOut only in ReadOnly mode
+ if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
- vcs->checkOut();
+ LYXERR(Debug::LYXVC, "LyXVC: checkOut");
+ return vcs->checkOut();
}
void LyXVC::revert()
{
- LYXERR(Debug::LYXVC) << "LyXVC: revert" << endl;
+ LYXERR(Debug::LYXVC, "LyXVC: revert");
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 saved version?"), file);
+ "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"));
void LyXVC::toggleReadOnly()
{
+ if (!vcs->toggleReadOnlyEnabled())
+ return;
+
switch (vcs->status()) {
case VCS::UNLOCKED:
- LYXERR(Debug::LYXVC) << "LyXVC: toggle to locked" << endl;
+ LYXERR(Debug::LYXVC, "LyXVC: toggle to locked");
checkOut();
break;
case VCS::LOCKED:
- LYXERR(Debug::LYXVC) << "LyXVC: toggle to unlocked" << endl;
+ LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked");
checkIn();
break;
}
if (!vcs)
return string();
- FileName const tmpf(tempName(FileName(), "lyxvclog"));
+ FileName const tmpf = FileName::tempName("lyxvclog");
if (tmpf.empty()) {
- LYXERR(Debug::LYXVC) << "Could not generate logfile "
- << tmpf << endl;
+ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return string();
}
- LYXERR(Debug::LYXVC) << "Generating logfile " << tmpf << endl;
+ LYXERR(Debug::LYXVC, "Generating logfile " << tmpf);
vcs->getLog(tmpf);
return tmpf.absFilename();
}
+bool LyXVC::checkOutEnabled()
+{
+ return vcs && vcs->checkOutEnabled();
+}
+
+
+bool LyXVC::checkInEnabled()
+{
+ return vcs && vcs->checkInEnabled();
+}
+
+
+bool LyXVC::undoLastEnabled()
+{
+ return vcs && vcs->undoLastEnabled();
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff