#pragma implementation
#endif
-#include FORMS_H_LOCATION
#include "lyxvc.h"
+#include "vc-backend.h"
#include "debug.h"
-#include "lyx_gui_misc.h"
-#include "bufferlist.h"
-#include "support/syscall.h"
-#include "support/path.h"
-#include "support/filetools.h"
-#include "support/FileInfo.h"
+#include "buffer.h"
+#include "BufferView.h"
#include "gettext.h"
#include "LyXView.h"
#include "lyxfunc.h"
-#include "latexoptions.h"
-extern BufferList bufferlist;
-extern void MenuWrite(Buffer *);
+#include "frontends/Alert.h"
+
+#include "support/filetools.h"
+#include "support/lyxlib.h"
+
+#include <unistd.h>
+using std::endl;
+using std::pair;
LyXVC::LyXVC()
{
- backend = UNKNOWN_VCS;
- _owner = 0;
- browser = 0;
+ vcs = 0;
+ owner_ = 0;
}
LyXVC::~LyXVC()
{
- if (browser) {
- if (browser->LaTeXLog->visible)
- fl_hide_form(browser->LaTeXLog);
- fl_free_form(browser->LaTeXLog);
- }
+ delete vcs;
}
bool LyXVC::file_found_hook(string const & fn)
{
- string tmp(fn);
- FileInfo f;
- // Check if *,v exists.
- tmp += ",v";
- lyxerr[Debug::LYXVC] << "Checking if file is under vc: "
- << tmp << endl;
- if (f.newFile(tmp).readable()) {
- lyxerr[Debug::LYXVC] << "Yes it is under vc." << endl;
- master = tmp;
- backend = RCS_VCS;
- scanMaster();
+ string found_file;
+ // Check if file is under RCS
+ if (!(found_file = RCS::find_file(fn)).empty()) {
+ vcs = new RCS(found_file);
+ vcs->owner(owner_);
+ return true;
+ }
+ // Check if file is under CVS
+ if (!(found_file = CVS::find_file(fn)).empty()) {
+ vcs = new CVS(found_file, fn);
+ vcs->owner(owner_);
return true;
- } else {
- // Check if RCS/*,v exists.
- tmp = AddName(AddPath(OnlyPath(fn), "RCS"), fn);
- tmp += ",v";
- lyxerr[Debug::LYXVC] << "Checking if file is under vc: "
- << tmp << endl;
- if (f.newFile(tmp).readable()) {
- lyxerr[Debug::LYXVC] << "Yes it is under vc."<< endl;
- master = tmp;
- backend = RCS_VCS;
- scanMaster();
- return true;
- }
}
- // If either one, return true
-
// file is not under any VCS.
return false;
}
-bool LyXVC::file_not_found_hook(string const &)
+bool LyXVC::file_not_found_hook(string const & fn)
{
- // file is not under any VCS.
+ // Check if file is under RCS
+ if (!RCS::find_file(fn).empty())
+ return true;
+ if (!CVS::find_file(fn).empty())
+ return true;
return false;
}
-void LyXVC::scanMaster()
+void LyXVC::buffer(Buffer * buf)
{
- lyxerr[Debug::LYXVC] << "LyXVC: This file is a VC file." << endl;
-
- LyXLex lex(0, 0);
- lex.setFile(master);
-
- string token;
- bool read_enough = false;
- while (lex.IsOK() && !read_enough) {
- lex.next();
- token = lex.GetString();
-
- lyxerr[Debug::LYXVC] <<"LyXVC::scanMaster: current lex text: `"
- << token << "'" << endl;
-
- if (token.empty())
- continue;
- else if (token == "head") {
- // get version here
- lex.next();
- string tmv = strip(lex.GetString(), ';');
- version = tmv;
- } else if (contains(token, "access")
- || contains(token, "symbols")
- || contains(token, "strict")) {
- // nothing
- } else if (contains(token, "locks")) {
- // get locker here
- if (contains(token, ";")) {
- locker = "Unlocked";
- vcstat = UNLOCKED;
- continue;
- }
- string tmpt, s1, s2;
- do {
- lex.next();
- s1 = strip(tmpt = lex.GetString(), ';');
- // tmp is now in the format <user>:<version>
- s1 = split(s1, s2, ':');
- // s2 is user, and s1 is version
- if (s1 == version) {
- locker = s2;
- vcstat = LOCKED;
- break;
- }
- } while (!contains(tmpt, ";"));
-
- } else if (token == "comment") {
- // we don't need to read any further than this.
- read_enough = true;
- } else {
- // unexpected
- lyxerr[Debug::LYXVC]
- << "LyXVC::scanMaster(): unexpected token"
- << endl;
- }
- }
+ owner_ = buf;
}
-void LyXVC::setBuffer(Buffer * buf)
+void LyXVC::registrer()
{
- _owner = buf;
-}
+ // it is very likely here that the vcs is not created yet...
+ if (!vcs) {
+ string const cvs_entries = "CVS/Entries";
+ if (IsFileReadable(cvs_entries)) {
+ lyxerr[Debug::LYXVC]
+ << "LyXVC: registering "
+ << MakeDisplayPath(owner_->fileName())
+ << " with CVS" << endl;
+ vcs = new CVS(cvs_entries, owner_->fileName());
-//
-// I will probably add some backend_xxxx functions later to perform the
-// version control system specific commands. Something like:
-// void backend_revert(<params>) {
-// if (backend == "RCS") {
-// } else if (backend == "CVS") {
-// } else if (backend == "SCCS") {
-// }
-//
-// But for 0.12 we will only support RCS.
-//
+ } else {
+ lyxerr[Debug::LYXVC]
+ << "LyXVC: registering "
+ << MakeDisplayPath(owner_->fileName())
+ << " with RCS" << endl;
+ vcs = new RCS(owner_->fileName());
+ }
+
+ vcs->owner(owner_);
+ }
-void LyXVC::registrer()
-{
// If the document is changed, we might want to save it
- if (!_owner->isLyxClean() &&
- AskQuestion(_("Changes in document:"),
- MakeDisplayPath(_owner->getFileName(),50),
+ if (!vcs->owner()->isLyxClean() &&
+ Alert::askQuestion(_("Changes in document:"),
+ MakeDisplayPath(vcs->owner()->fileName(), 50),
_("Save document and proceed?"))) {
- MenuWrite(_owner);
+ vcs->owner()->getUser()->owner()
+ ->getLyXFunc()->dispatch(LFUN_MENUWRITE);
}
// Maybe the save fails, or we answered "no". In both cases,
// the document will be dirty, and we abort.
- if (!_owner->isLyxClean()) {
+ if (!vcs->owner()->isLyxClean()) {
return;
}
lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
- string tmp = askForText(_("LyX VC: Initial description"),
- _("(no initial description)"));
- if (tmp.empty()) {
+ pair<bool, string> tmp =
+ Alert::askForText(_("LyX VC: Initial description"),
+ _("(no initial description)"));
+ if (!tmp.first || tmp.second.empty()) {
+ // should we insist on checking tmp.second.empty()?
lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
- WriteAlert(_("Info"), _("This document has NOT been registered."));
+ Alert::alert(_("Info"),
+ _("This document has NOT been registered."));
return;
}
- string cmd = "ci -q -u -i -t-\"";
- cmd += tmp;
- cmd += "\" \"";
- cmd += OnlyFilename(_owner->getFileName());
- cmd += "\"";
- doVCCommand(cmd);
- _owner->getUser()->getOwner()->getLyXFunc()->Dispatch("buffer-reload");
+
+ vcs->registrer(tmp.second);
}
void LyXVC::checkIn()
{
// If the document is changed, we might want to save it
- if (!_owner->isLyxClean() &&
- AskQuestion(_("Changes in document:"),
- MakeDisplayPath(_owner->getFileName(),50),
+ if (!vcs->owner()->isLyxClean() &&
+ Alert::askQuestion(_("Changes in document:"),
+ MakeDisplayPath(vcs->owner()->fileName(), 50),
_("Save document and proceed?"))) {
- MenuWrite(_owner);
+ vcs->owner()->getUser()->owner()
+ ->getLyXFunc()->dispatch(LFUN_MENUWRITE);
}
// Maybe the save fails, or we answered "no". In both cases,
// the document will be dirty, and we abort.
- if (!_owner->isLyxClean()) {
+ if (!vcs->owner()->isLyxClean()) {
return;
}
lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl;
- _owner->getUser()->getOwner()->getLyXFunc()->Dispatch(LFUN_MENUWRITE);
- string tmp = askForText(_("LyX VC: Log Message"));
- if (tmp.empty()) tmp = "(no log msg)";
- doVCCommand("ci -q -u -m\"" + tmp + "\" \""
- + OnlyFilename(_owner->getFileName()) + "\"");
- _owner->getUser()->getOwner()->getLyXFunc()->Dispatch("buffer-reload");
+ pair<bool, string> tmp = Alert::askForText(_("LyX VC: Log Message"));
+ if (tmp.first) {
+ if (tmp.second.empty()) {
+ tmp.second = _("(no log message)");
+ }
+ vcs->checkIn(tmp.second);
+ } else {
+ lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
+ }
}
void LyXVC::checkOut()
{
lyxerr[Debug::LYXVC] << "LyXVC: checkOut" << endl;
- if (!_owner->isLyxClean()
- && !AskQuestion(_("Changes in document:"),
- MakeDisplayPath(_owner->getFileName(),50),
+ if (!vcs->owner()->isLyxClean()
+ && !Alert::askQuestion(_("Changes in document:"),
+ MakeDisplayPath(vcs->owner()->fileName(), 50),
_("Ignore changes and proceed with check out?"))) {
return;
}
- _owner->markLyxClean();
- doVCCommand("co -q -l \""
- + OnlyFilename(_owner->getFileName()) + "\"");
- _owner->getUser()->getOwner()->getLyXFunc()->Dispatch("buffer-reload");
+ vcs->checkOut();
+
}
// Here we should check if the buffer is dirty. And if it is
// we should warn the user that reverting will discard all
// changes made since the last check in.
- if (AskQuestion(_("When you revert, you will loose all changes made"),
+ if (Alert::askQuestion(_("When you revert, you will loose all changes made"),
_("to the document since the last check in."),
_("Do you still want to do it?"))) {
-
- doVCCommand("co -f -u" + getVersion() + " \""
- + OnlyFilename(_owner->getFileName()) + "\"");
- // We ignore changes and just reload!
- _owner->markLyxClean();
- _owner->getUser()->getOwner()->
- getLyXFunc()->Dispatch("buffer-reload");
+
+ vcs->revert();
}
}
void LyXVC::undoLast()
{
- lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
- doVCCommand("rcs -o" + getVersion() + " \""
- + OnlyFilename(_owner->getFileName()) + "\"");
+ vcs->undoLast();
}
void LyXVC::toggleReadOnly()
{
- switch (vcstat) {
- case UNLOCKED:
+ switch (vcs->status()) {
+ case VCS::UNLOCKED:
+ lyxerr[Debug::LYXVC] << "LyXVC: toggle to locked" << endl;
checkOut();
break;
- case LOCKED:
+ case VCS::LOCKED:
+ lyxerr[Debug::LYXVC] << "LyXVC: toggle to unlocked" << endl;
checkIn();
break;
}
bool LyXVC::inUse()
{
- if (!master.empty())
- return true;
+ if (vcs) return true;
return false;
}
-string const LyXVC::getVersion() const
-{
- return version;
-}
-
-
-string const LyXVC::getLocker() const
-{
- return locker;
-}
-
-// This is a hack anyway so I'll put it here in the mean time.
-void LyXVC::logClose(FL_OBJECT * obj, long)
-{
- LyXVC * This = static_cast<LyXVC*>(obj->form->u_vdata);
- fl_hide_form(This->browser->LaTeXLog);
-}
-
-
-// and, hack over hack, here is a C wrapper :)
-extern "C" void C_LyXVC_logClose(FL_OBJECT * ob, long data)
-{
- LyXVC::logClose(ob, data);
-}
-
-
-void LyXVC::logUpdate(FL_OBJECT * obj, long)
-{
- LyXVC * This = static_cast<LyXVC*>(obj->form->u_vdata);
- This->showLog();
-}
+//string const & LyXVC::version() const
+//{
+// return vcs->version();
+//}
-extern "C" void C_LyXVC_logUpdate(FL_OBJECT *ob, long data)
+string const LyXVC::versionString() const
{
- LyXVC::logUpdate(ob, data);
+ return vcs->versionString();
}
-void LyXVC::viewLog(string const & fil)
+string const & LyXVC::locker() const
{
- static int ow = -1, oh;
-
- if (!browser) {
- FL_OBJECT * obj;
- browser = (FD_LaTeXLog *) fl_calloc(1, sizeof(*browser));
-
- browser->LaTeXLog = fl_bgn_form(FL_NO_BOX, 470, 380);
- browser->LaTeXLog->u_vdata = this;
- obj = fl_add_box(FL_UP_BOX, 0, 0, 470, 380, "");
- browser->browser_latexlog = fl_add_browser(FL_NORMAL_BROWSER,
- 10, 10,
- 450, 320, "");
- obj = fl_add_button(FL_RETURN_BUTTON, 270, 340, 90, 30,
- _("Close"));
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_LyXVC_logClose, 0);
- obj = fl_add_button(FL_NORMAL_BUTTON,370,340,90,30,
- idex(_("Update|#Uu")));
- fl_set_button_shortcut(obj,scex(_("Update|#Uu")),1);
- fl_set_object_lsize(obj,FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_LyXVC_logUpdate,0);
- fl_end_form();
- fl_set_form_atclose(browser->LaTeXLog, CancelCloseBoxCB, 0);
- }
-
- if (!fl_load_browser(browser->browser_latexlog, fil.c_str()))
- fl_add_browser_line(browser->browser_latexlog,
- _("No RCS History!"));
-
- if (browser->LaTeXLog->visible) {
- fl_raise_form(browser->LaTeXLog);
- } else {
- fl_show_form(browser->LaTeXLog,
- FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
- _("RCS History"));
- if (ow < 0) {
- ow = browser->LaTeXLog->w;
- oh = browser->LaTeXLog->h;
- }
- fl_set_form_minsize(browser->LaTeXLog, ow, oh);
- }
+ return vcs->locker();
}
-void LyXVC::showLog()
+const string LyXVC::getLogFile() const
{
- string tmpf = tmpnam(0);
- doVCCommand("rlog \""
- + OnlyFilename(_owner->getFileName()) + "\" > " + tmpf);
- viewLog(tmpf);
- unlink(tmpf.c_str());
-}
-
+ if (!vcs)
+ return string();
-int LyXVC::doVCCommand(string const & cmd)
-{
- lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl;
- Systemcalls one;
- Path p(_owner->filepath);
- int ret = one.startscript(Systemcalls::System, cmd);
- return ret;
+ string tmpf = lyx::tempName(string(), "lyxvclog");
+ lyxerr[Debug::LYXVC] << "Generating logfile " << tmpf << endl;
+ vcs->getLog(tmpf);
+ return tmpf;
}
projects / lyx.git / blobdiff