This comment is wrong and causes bug in revision control.

[lyx.git] / src / VCBackend.cpp

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index c92a648ffd7b6d6e3e6074d47b13786ed8f9940c..eb9def38f175ca039829c958c3adce8d26e50625 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -11,12 +11,12 @@
 #include <config.h>
 
 #include "VCBackend.h"
-#include "support/debug.h"
 #include "Buffer.h"
 
-#include "support/Path.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/Path.h"
 #include "support/Systemcall.h"
 
 #include <boost/regex.hpp>
@@ -24,6 +24,7 @@
 #include <fstream>
 
 using namespace std;
+using namespace lyx::support;
 
 using boost::regex;
 using boost::regex_match;
@@ -31,17 +32,6 @@ using boost::smatch;
 
 namespace lyx {
 
-using support::addName;
-using support::addPath;
-using support::contains;
-using support::FileName;
-using support::onlyFilename;
-using support::onlyPath;
-using support::quoteName;
-using support::rtrim;
-using support::split;
-using support::Systemcall;
-
 
 int VCS::doVCCommand(string const & cmd, FileName const & path)
 {
@@ -70,7 +60,7 @@ FileName const RCS::findFile(FileName const & file)
 {
        // Check if *,v exists.
        FileName tmp(file.absFilename() + ",v");
-       LYXERR(Debug::LYXVC, "Checking if file is under rcs: " << tmp);
+       LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
        if (tmp.isReadableFile()) {
                LYXERR(Debug::LYXVC, "Yes " << file << " is under rcs.");
                return tmp;
@@ -78,7 +68,7 @@ FileName const RCS::findFile(FileName const & file)
 
        // Check if RCS/*,v exists.
        tmp = FileName(addName(addPath(onlyPath(file.absFilename()), "RCS"), file.absFilename()) + ",v");
-       LYXERR(Debug::LYXVC, "Checking if file is under rcs: " << tmp);
+       LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
        if (tmp.isReadableFile()) {
                LYXERR(Debug::LYXVC, "Yes " << file << " it is under rcs.");
                return tmp;
@@ -229,7 +219,7 @@ FileName const CVS::findFile(FileName const & file)
        // where we have file.
        FileName const dir(onlyPath(file.absFilename()) + "/CVS/Entries");
        string const tmpf = '/' + onlyFilename(file.absFilename()) + '/';
-       LYXERR(Debug::LYXVC, "LyXVC: checking in `" << dir
+       LYXERR(Debug::LYXVC, "LyXVC: Checking in `" << dir
                             << "' for `" << tmpf << '\'');
        if (dir.isReadableDirectory()) {
                // Ok we are at least in a CVS dir. Parse the CVS/Entries