#pragma implementation
#endif
-#include <fstream>
-
#include "vc-backend.h"
#include "debug.h"
+#include "buffer.h"
+#include "BufferView.h"
+#include "LyXView.h"
+#include "lyxfunc.h"
+
#include "support/FileInfo.h"
#include "support/LRegex.h"
#include "support/LSubstring.h"
#include "support/path.h"
-#include "buffer.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
+
+#include <fstream>
using std::endl;
using std::ifstream;
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;
}
vcstatus = UNLOCKED;
continue;
}
- string tmpt, s1, s2;
+ string tmpt;
+ string s1;
+ string s2;
do {
ifs >> tmpt;
s1 = strip(tmpt, ';');
<< endl;
}
}
- version_ = "RCS: " + version_;
}
cmd += OnlyFilename(owner_->fileName());
cmd += "\"";
doVCCommand(cmd, owner_->filepath);
- owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
+ owner_->getUser()->owner()->getLyXFunc()->dispatch("buffer-reload");
}
{
doVCCommand("ci -q -u -m\"" + msg + "\" \""
+ OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
- owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
+ owner_->getUser()->owner()->getLyXFunc()->dispatch("buffer-reload");
}
owner_->markLyxClean();
doVCCommand("co -q -l \""
+ OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
- owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
+ owner_->getUser()->owner()->getLyXFunc()->dispatch("buffer-reload");
}
// We ignore changes and just reload!
owner_->markLyxClean();
owner_->getUser()->owner()
- ->getLyXFunc()->Dispatch("buffer-reload");
+ ->getLyXFunc()->dispatch("buffer-reload");
}
{
lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
doVCCommand("rcs -o" + version() + " \""
- + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
+ + OnlyFilename(owner_->fileName()) + "\"",
+ owner_->filepath);
}
{
// 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
lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << "'" << endl;
string line;
LRegex reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
- while(getline(ifs, line)) {
+ while (getline(ifs, line)) {
lyxerr[Debug::LYXVC] << "\t line: " << line << endl;
if (contains(line, tmpf)) {
// Ok extract the fields.
LRegex::SubMatches const & sm = reg.exec(line);
//sm[0]; // whole matched string
//sm[1]; // filename
- version_ = "CVS: ";
- version_ += LSubstring(line, sm[2].first,
+ version_ = LSubstring(line, sm[2].first,
sm[2].second);
string file_date = LSubstring(line, sm[3].first,
sm[3].second);
{
doVCCommand("cvs -q add -m \"" + msg + "\" \""
+ OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
- owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
+ owner_->getUser()->owner()->getLyXFunc()->dispatch("buffer-reload");
}
void CVS::checkIn(string const & msg)
{
doVCCommand("cvs -q commit -m \"" + msg + "\" \""
- + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
- owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
+ + OnlyFilename(owner_->fileName()) + "\"",
+ owner_->filepath);
+ owner_->getUser()->owner()->getLyXFunc()->dispatch("buffer-reload");
}
void CVS::revert()
{
- // not sure how to do this...
- // rm file
- // cvs update
- lyxerr << "Sorry not implemented." << endl;
+ // Reverts to the version in CVS repository and
+ // gets the updated version from the repository.
+ string const fil = OnlyFilename(owner_->fileName());
+
+ doVCCommand("rm -f \"" + fil + "\"; cvs update \"" + fil + "\"",
+ owner_->filepath);
+ owner_->markLyxClean();
+ owner_->getUser()->owner()
+ ->getLyXFunc()->dispatch("buffer-reload");
}
}
-void CVS::getLog(string const &)
+void CVS::getLog(string const & tmpf)
{
- lyxerr << "Sorry not implemented." << endl;
+ doVCCommand("cvs log \""
+ + OnlyFilename(owner_->fileName()) + "\" > " + tmpf,
+ owner_->filepath);
}