Forgotten. There should be some oneliner for substituting all these.

[features.git] / src / VCBackend.cpp

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index dd3aa9b9cf6af7c5373ca33d93c1b1db547bf48d..c7e06508b86c97b62ebb218d657e0970b838303b 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -536,16 +536,13 @@ FileName const SVN::findFile(FileName const & file)
 
 void SVN::scanMaster()
 {
-       locker_.clear();
        // vcstatus code is somewhat superflous, until we want
        // to implement read-only toggle for svn.
        vcstatus = NOLOCKING;
        if (checkLockMode()) {
                if (isLocked()) {
-                       locker_ = "Locked";
                        vcstatus = LOCKED;
                } else {
-                       locker_ = "Unlocked";
                        vcstatus = UNLOCKED;
                }
        }
@@ -741,8 +738,8 @@ string SVN::repoUpdate()
        }
 
        doVCCommand("svn diff " + quoteName(owner_->filePath())
-       + " > " + quoteName(tmpf.toFilesystemEncoding()),
-       FileName(owner_->filePath()));
+                   + " > " + quoteName(tmpf.toFilesystemEncoding()),
+               FileName(owner_->filePath()));
        docstring res = tmpf.fileContents("UTF-8");
        if (!res.empty()) {
                LYXERR(Debug::LYXVC, "Diff detected:\n" << res);
@@ -900,6 +897,10 @@ string SVN::revisionInfo(LyXVC::RevisionInfo const info)
 bool SVN::getFileRevisionInfo()
 {
        FileName tmpf = FileName::tempName("lyxvcout");
+       if (tmpf.empty()) {
+               LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+               return N_("Error: Could not generate logfile.");
+       }
 
        doVCCommand("svn info --xml " + quoteName(onlyFilename(owner_->absFileName()))
                    + " > " + quoteName(tmpf.toFilesystemEncoding()),
@@ -949,6 +950,10 @@ bool SVN::getFileRevisionInfo()
 bool SVN::getTreeRevisionInfo()
 {
        FileName tmpf = FileName::tempName("lyxvcout");
+       if (tmpf.empty()) {
+               LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+               return N_("Error: Could not generate logfile.");
+       }
 
        doVCCommand("svnversion -n . > " + quoteName(tmpf.toFilesystemEncoding()),
                    FileName(owner_->filePath()));