}
// file is not under any VCS.
+ vcs.reset(0);
return false;
}
// Seems there is no reasonable scenario for adding implementation
// of retrieve for cvs or svn.
if (!RCS::findFile(fn).empty()) {
- docstring const file = makeDisplayPath(fn.absFilename(), 20);
+ docstring const file = makeDisplayPath(fn.absFileName(), 20);
docstring const text =
bformat(_("Do you want to retrieve the document"
" %1$s from version control?"), file);
// it is very likely here that the vcs is not created yet...
if (!vcs) {
//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");
+ 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 "
_("(no initial description)"));
if (!ok) {
LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
+ vcs.reset(0);
return false;
}
if (response.empty())
docstring empty(_("(no log message)"));
docstring response;
string log;
- bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
+ bool ok = true;
+ if (vcs->isCheckInWithConfirmation())
+ ok = Alert::askForText(response, _("LyX VC: Log Message"));
if (ok) {
if (response.empty())
response = empty;
+ //shell collisions
+ response = subst(response, from_utf8("\""), from_utf8("\\\""));
log = vcs->checkIn(to_utf8(response));
// Reserve empty string for cancel button
string LyXVC::checkOut()
{
//RCS allows checkOut only in ReadOnly mode
- if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
+ if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly())
+ return string();
LYXERR(Debug::LYXVC, "LyXVC: checkOut");
return vcs->checkOut();
}
-void LyXVC::revert()
+bool LyXVC::revert()
{
LYXERR(Debug::LYXVC, "LyXVC: revert");
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 older version?"), file);
- int const ret = Alert::prompt(_("Revert to stored version of document?"),
- text, 0, 1, _("&Revert"), _("&Cancel"));
+ int ret = 0;
+ if (vcs->isRevertWithConfirmation())
+ ret = Alert::prompt(_("Revert to stored version of document?"),
+ text, 0, 1, _("&Revert"), _("&Cancel"));
- if (ret == 0)
- vcs->revert();
+ return ret == 0 && vcs->revert();
}
}
LYXERR(Debug::LYXVC, "Generating logfile " << tmpf);
vcs->getLog(tmpf);
- return tmpf.absFilename();
+ return tmpf.absFileName();
}
-std::string LyXVC::revisionInfo(RevisionInfo const info)
+string LyXVC::revisionInfo(RevisionInfo const info) const
{
if (!vcs)
return string();
return vcs && vcs->undoLastEnabled();
}
-bool LyXVC::prepareFileRevision(int rev, std::string & f)
+
+bool LyXVC::repoUpdateEnabled() const
+{
+ return vcs && vcs->repoUpdateEnabled();
+}
+
+
+bool LyXVC::prepareFileRevision(string const & rev, std::string & f)
{
return vcs && vcs->prepareFileRevision(rev, f);
}