r36153 - lyx-devel/trunk/src

[sanda]

Author: sanda
Date: Sat Nov  6 03:21:04 2010
New Revision: 36153
URL: http://www.lyx.org/trac/changeset/36153

Log:
Fix RCS part of #6396. Btw revert is slightly broken now...

Modified:
   lyx-devel/trunk/src/VCBackend.cpp

Modified: lyx-devel/trunk/src/VCBackend.cpp
==============================================================================
--- lyx-devel/trunk/src/VCBackend.cpp   Sat Nov  6 01:48:00 2010        (r36152)
+++ lyx-devel/trunk/src/VCBackend.cpp   Sat Nov  6 03:21:04 2010        (r36153)
@@ -195,9 +195,27 @@
        return owner_ && !owner_->isReadonly();
 }
 
+
 bool RCS::isCheckInWithConfirmation()
 {
-       //FIXME diff
+       // FIXME one day common getDiff for all backends
+       // docstring diff;
+       // if (getDiff(file, diff) && diff.empty())
+       //      return false;
+
+       FileName tmpf = FileName::tempName("lyxvcout");
+       if (tmpf.empty()) {
+               LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+               return true;
+       }
+
+       doVCCommandCall("rcsdiff " + quoteName(owner_->absFileName())
+                   + " > " + quoteName(tmpf.toFilesystemEncoding()),
+               FileName(owner_->filePath()));
+
+       if (tmpf.fileContents("UTF-8").empty())
+               return false;
+
        return true;
 }