A little more lv cleanup.

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 4ead9126f535088d93afa4190db9c937036b93cb..36b612190d9f05887d910edbaf10dd00fd3ab519 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -160,13 +160,18 @@ bool LyXVC::registrer()
 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");
        }
@@ -177,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();
@@ -248,21 +254,15 @@ bool LyXVC::inUse() const
 }
 
 
-//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;
 }
 
 
@@ -282,6 +282,15 @@ string const LyXVC::getLogFile() const
 }
 
 
+std::string LyXVC::revisionInfo(RevisionInfo const info)
+{
+       if (!vcs)
+               return string();
+
+       return vcs->revisionInfo(info);
+}
+
+
 bool LyXVC::checkOutEnabled() const
 {
        return vcs && vcs->checkOutEnabled();
@@ -305,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