// 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;
+ if (!RCS::findFile(fn).empty()) {
+ docstring const file = makeDisplayPath(fn.absFileName(), 20);
+ docstring const text =
+ bformat(_("Do you want to retrieve the document"
+ " %1$s from version control?"), file);
+ int const ret = Alert::prompt(_("Retrieve from version control?"),
+ text, 0, 1, _("&Retrieve"), _("&Cancel"));
+
+ if (ret == 0) {
+ // How can we know _how_ to do the checkout?
+ // With the current VC support it has to be an RCS
+ // file since CVS and SVN do not have special ,v files.
+ RCS::retrieve(fn);
+ return true;
+ }
+ }
return false;
}
// 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 "
string LyXVC::checkIn()
{
LYXERR(Debug::LYXVC, "LyXVC: checkIn");
+ docstring empty(_("(no log message)"));
docstring response;
string log;
bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
if (ok) {
if (response.empty())
- response = _("(no log message)");
+ response = empty;
log = vcs->checkIn(to_utf8(response));
+
+ // Reserve empty string for cancel button
+ if (log.empty())
+ log = to_utf8(empty);
} else {
LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
}
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();
}
-string LyXVC::repoSynchro()
+string LyXVC::repoUpdate()
{
- LYXERR(Debug::LYXVC, "LyXVC: repoSynchro");
- return vcs->repoSynchro();
+ LYXERR(Debug::LYXVC, "LyXVC: repoUpdate");
+ return vcs->repoUpdate();
}
}
-bool LyXVC::inUse()
+bool LyXVC::inUse() const
{
if (vcs)
return true;
}
-//string const & LyXVC::version() const
-//{
-// return vcs->version();
-//}
-
-
string const LyXVC::versionString() const
{
return vcs->versionString();
}
-string const & LyXVC::locker() const
+bool LyXVC::locking() const
{
- return vcs->locker();
+ return vcs->status() != VCS::NOLOCKING;
}
}
LYXERR(Debug::LYXVC, "Generating logfile " << tmpf);
vcs->getLog(tmpf);
- return tmpf.absFilename();
+ return tmpf.absFileName();
+}
+
+
+std::string LyXVC::revisionInfo(RevisionInfo const info)
+{
+ if (!vcs)
+ return string();
+
+ return vcs->revisionInfo(info);
}
-bool LyXVC::checkOutEnabled()
+bool LyXVC::checkOutEnabled() const
{
return vcs && vcs->checkOutEnabled();
}
-bool LyXVC::checkInEnabled()
+bool LyXVC::checkInEnabled() const
{
return vcs && vcs->checkInEnabled();
}
-bool LyXVC::lockingToggleEnabled()
+bool LyXVC::lockingToggleEnabled() const
{
return vcs && vcs->lockingToggleEnabled();
}
-bool LyXVC::undoLastEnabled()
+bool LyXVC::undoLastEnabled() const
{
return vcs && vcs->undoLastEnabled();
}
+bool LyXVC::prepareFileRevision(string const & rev, std::string & f)
+{
+ return vcs && vcs->prepareFileRevision(rev, f);
+}
+
+
+bool LyXVC::prepareFileRevisionEnabled()
+{
+ return vcs && vcs->prepareFileRevisionEnabled();
+}
} // namespace lyx