r36154 - lyx-devel/trunk/src

[sanda]

Author: sanda
Date: Sat Nov  6 03:38:35 2010
New Revision: 36154
URL: http://www.lyx.org/trac/changeset/36154

Log:
Quickfix closing #6396.
sleep sleep

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

Modified: lyx-devel/trunk/src/VCBackend.cpp
==============================================================================
--- lyx-devel/trunk/src/VCBackend.cpp   Sat Nov  6 03:21:04 2010        (r36153)
+++ lyx-devel/trunk/src/VCBackend.cpp   Sat Nov  6 03:38:35 2010        (r36154)
@@ -213,7 +213,10 @@
                    + " > " + quoteName(tmpf.toFilesystemEncoding()),
                FileName(owner_->filePath()));
 
-       if (tmpf.fileContents("UTF-8").empty())
+       docstring diff = tmpf.fileContents("UTF-8");
+       tmpf.erase();
+
+       if (diff.empty())
                return false;
 
        return true;
@@ -1070,7 +1073,24 @@
 
 bool SVN::isCheckInWithConfirmation()
 {
-       //FIXME diff
+       // FIXME one day common getDiff and perhaps OpMode for all backends
+
+       FileName tmpf = FileName::tempName("lyxvcout");
+       if (tmpf.empty()) {
+               LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+               return true;
+       }
+
+       doVCCommandCall("svn diff " + quoteName(owner_->absFileName())
+                   + " > " + quoteName(tmpf.toFilesystemEncoding()),
+               FileName(owner_->filePath()));
+
+       docstring diff = tmpf.fileContents("UTF-8");
+       tmpf.erase();
+
+       if (diff.empty())
+               return false;
+
        return true;
 }