X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXVC.cpp;h=36b612190d9f05887d910edbaf10dd00fd3ab519;hb=b8550d11e836e857967a31250e6ca248b2d43f82;hp=173756f9e7a14b2c2ca5713d5208ff3b11eb258f;hpb=495daad2770a842b442fe9c34b26dbb538cc70ff;p=lyx.git diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 173756f9e7..36b612190d 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -182,7 +182,8 @@ string LyXVC::checkIn() 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(); @@ -259,9 +260,9 @@ string const LyXVC::versionString() const } -string const & LyXVC::locker() const +bool LyXVC::locking() const { - return vcs->locker(); + return vcs->status() != VCS::NOLOCKING; } @@ -313,5 +314,15 @@ 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