#endif
#include <fstream>
-using std::ifstream;
#include "vc-backend.h"
#include "debug.h"
#include "support/LRegex.h"
#include "support/LSubstring.h"
#include "support/path.h"
+#include "support/filetools.h"
#include "buffer.h"
#include "LyXView.h"
#include "lyxfunc.h"
+using std::endl;
+using std::ifstream;
+using std::getline;
int VCS::doVCCommand(string const & cmd, string const & path)
{
lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl;
Systemcalls one;
Path p(path);
- int ret = one.startscript(Systemcalls::System, cmd);
+ int const ret = one.startscript(Systemcalls::System, cmd);
return ret;
}
}
-string RCS::find_file(string const & file)
+string const RCS::find_file(string const & file)
{
string tmp(file);
// Check if *,v exists.
// get locker here
if (contains(token, ";")) {
locker_ = "Unlocked";
- vcstat = UNLOCKED;
+ vcstatus = UNLOCKED;
continue;
}
string tmpt, s1, s2;
// s2 is user, and s1 is version
if (s1 == version_) {
locker_ = s2;
- vcstat = LOCKED;
+ vcstatus = LOCKED;
break;
}
} while (!contains(tmpt, ";"));
}
-string CVS::find_file(string const & file)
+string const CVS::find_file(string const & file)
{
// First we look for the CVS/Entries in the same dir
// where we have file.
- string dir = OnlyPath(file);
- string tmpf = "/" + OnlyFilename(file) + "/";
- dir += "/CVS/Entries";
+ string const dir = OnlyPath(file) + "/CVS/Entries";
+ string const tmpf = "/" + OnlyFilename(file) + "/";
lyxerr[Debug::LYXVC] << "LyXVC: checking in `" << dir
<< "' for `" << tmpf << "'" << endl;
- FileInfo f(dir);
+ FileInfo const f(dir);
if (f.readable()) {
// Ok we are at least in a CVS dir. Parse the CVS/Entries
// and see if we can find this file. We do a fast and
<< mod_date << "'" << endl;
if (file_date == mod_date) {
locker_ = "Unlocked";
- vcstat = UNLOCKED;
+ vcstatus = UNLOCKED;
} else {
// Here we should also to some more checking
// to see if there are conflicts or not.
locker_ = "Locked";
- vcstat = LOCKED;
+ vcstatus = LOCKED;
}
break;
}