3 * This file is part of LyX, the document processor.
4 * Licence details can be found in the file COPYING.
6 * \author Lars Gullik Bjønnes
9 * Full author contact details are available in file CREDITS.
14 #include "VCBackend.h"
17 #include "FuncRequest.h"
19 #include "frontends/alert.h"
20 #include "frontends/Application.h"
22 #include "support/convert.h"
23 #include "support/debug.h"
24 #include "support/filetools.h"
25 #include "support/gettext.h"
26 #include "support/lstrings.h"
27 #include "support/Path.h"
28 #include "support/Systemcall.h"
29 #include "support/regex.h"
34 using namespace lyx::support;
41 int VCS::doVCCommandCall(string const & cmd, FileName const & path)
43 LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd);
45 support::PathChanger p(path);
46 return one.startscript(Systemcall::Wait, cmd, string(), false);
50 int VCS::doVCCommand(string const & cmd, FileName const & path, bool reportError)
53 owner_->setBusy(true);
55 int const ret = doVCCommandCall(cmd, path);
58 owner_->setBusy(false);
59 if (ret && reportError)
60 frontend::Alert::error(_("Revision control error."),
61 bformat(_("Some problem occured while running the command:\n"
68 bool VCS::makeRCSRevision(string const &version, string &revis) const
73 int back = convert<int>(rev);
74 // if positive use as the last number in the whole revision string
77 rsplit(version, base , '.' );
78 rev = base + "." + rev;
82 // we care about the last number from revision string
83 // in case of backward indexing
86 cur = rsplit(version, base , '.' );
89 int want = convert<int>(cur) + back;
93 rev = base + "." + convert<string>(want);
101 bool VCS::checkparentdirs(FileName const & file, std::string const & pathname)
103 FileName dirname = file.onlyPath();
104 FileName tocheck = FileName(addName(dirname.absFileName(),pathname));
105 LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName());
106 bool result = tocheck.exists();
107 while ( !result && !dirname.empty() ) {
108 //this construct because of #8295
109 dirname = FileName(dirname.absFileName()).parentPath();
110 LYXERR(Debug::LYXVC, "check directory: " << dirname.absFileName());
111 tocheck = FileName(addName(dirname.absFileName(),pathname));
112 result = tocheck.exists();
118 /////////////////////////////////////////////////////////////////////
122 /////////////////////////////////////////////////////////////////////
124 RCS::RCS(FileName const & m)
131 FileName const RCS::findFile(FileName const & file)
133 // Check if *,v exists.
134 FileName tmp(file.absFileName() + ",v");
135 LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
136 if (tmp.isReadableFile()) {
137 LYXERR(Debug::LYXVC, "Yes, " << file << " is under rcs.");
141 // Check if RCS/*,v exists.
142 tmp = FileName(addName(addPath(onlyPath(file.absFileName()), "RCS"), file.absFileName()) + ",v");
143 LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
144 if (tmp.isReadableFile()) {
145 LYXERR(Debug::LYXVC, "Yes, " << file << " is under rcs.");
153 void RCS::retrieve(FileName const & file)
155 LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file);
156 doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()),
161 void RCS::scanMaster()
166 LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster: " << master_);
168 ifstream ifs(master_.toFilesystemEncoding().c_str());
171 bool read_enough = false;
173 while (!read_enough && ifs >> token) {
174 LYXERR(Debug::LYXVC, "LyXVC::scanMaster: current lex text: `"
179 else if (token == "head") {
183 tmv = rtrim(tmv, ";");
185 LYXERR(Debug::LYXVC, "LyXVC: version found to be " << tmv);
186 } else if (contains(token, "access")
187 || contains(token, "symbols")
188 || contains(token, "strict")) {
190 } else if (contains(token, "locks")) {
192 if (contains(token, ';')) {
193 locker_ = "Unlocked";
202 s1 = rtrim(tmpt, ";");
203 // tmp is now in the format <user>:<version>
204 s1 = split(s1, s2, ':');
205 // s2 is user, and s1 is version
206 if (s1 == version_) {
211 } while (!contains(tmpt, ';'));
213 } else if (token == "comment") {
214 // we don't need to read any further than this.
218 LYXERR(Debug::LYXVC, "LyXVC::scanMaster(): unexpected token");
224 void RCS::registrer(string const & msg)
226 string cmd = "ci -q -u -i -t-\"";
229 cmd += quoteName(onlyFileName(owner_->absFileName()));
230 doVCCommand(cmd, FileName(owner_->filePath()));
234 string RCS::checkIn(string const & msg)
236 int ret = doVCCommand("ci -q -u -m\"" + msg + "\" "
237 + quoteName(onlyFileName(owner_->absFileName())),
238 FileName(owner_->filePath()));
239 return ret ? string() : "RCS: Proceeded";
243 bool RCS::checkInEnabled()
245 return owner_ && !owner_->isReadonly();
249 bool RCS::isCheckInWithConfirmation()
251 // FIXME one day common getDiff for all backends
253 // if (getDiff(file, diff) && diff.empty())
256 FileName tmpf = FileName::tempName("lyxvcout");
258 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
262 doVCCommandCall("rcsdiff " + quoteName(owner_->absFileName())
263 + " > " + quoteName(tmpf.toFilesystemEncoding()),
264 FileName(owner_->filePath()));
266 docstring diff = tmpf.fileContents("UTF-8");
276 string RCS::checkOut()
279 int ret = doVCCommand("co -q -l " + quoteName(onlyFileName(owner_->absFileName())),
280 FileName(owner_->filePath()));
281 return ret ? string() : "RCS: Proceeded";
285 bool RCS::checkOutEnabled()
287 return owner_ && owner_->isReadonly();
291 string RCS::repoUpdate()
293 lyxerr << "Sorry, not implemented." << endl;
298 bool RCS::repoUpdateEnabled()
304 string RCS::lockingToggle()
306 //FIXME this might be actually possible, study rcs -U, rcs -L.
307 //State should be easy to get inside scanMaster.
308 //It would fix #4370 and make rcs/svn usage even more closer.
309 lyxerr << "Sorry, not implemented." << endl;
314 bool RCS::lockingToggleEnabled()
322 if (doVCCommand("co -f -u" + version_ + " "
323 + quoteName(onlyFileName(owner_->absFileName())),
324 FileName(owner_->filePath())))
326 // We ignore changes and just reload!
332 bool RCS::isRevertWithConfirmation()
334 //FIXME owner && diff ?
341 LYXERR(Debug::LYXVC, "LyXVC: undoLast");
342 doVCCommand("rcs -o" + version_ + " "
343 + quoteName(onlyFileName(owner_->absFileName())),
344 FileName(owner_->filePath()));
348 bool RCS::undoLastEnabled()
354 void RCS::getLog(FileName const & tmpf)
356 doVCCommand("rlog " + quoteName(onlyFileName(owner_->absFileName()))
357 + " > " + quoteName(tmpf.toFilesystemEncoding()),
358 FileName(owner_->filePath()));
362 bool RCS::toggleReadOnlyEnabled()
364 // This got broken somewhere along lfuns dispatch reorganization.
365 // reloadBuffer would be needed after this, but thats problematic
366 // since we are inside Buffer::dispatch.
372 string RCS::revisionInfo(LyXVC::RevisionInfo const info)
374 if (info == LyXVC::File)
376 // fill the rest of the attributes for a single file
377 if (rev_date_cache_.empty())
378 if (!getRevisionInfo())
383 return rev_author_cache_;
385 return rev_date_cache_;
387 return rev_time_cache_;
395 bool RCS::getRevisionInfo()
397 FileName tmpf = FileName::tempName("lyxvcout");
399 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
402 doVCCommand("rlog -r " + quoteName(onlyFileName(owner_->absFileName()))
403 + " > " + quoteName(tmpf.toFilesystemEncoding()),
404 FileName(owner_->filePath()));
409 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
412 // we reached to the entry, i.e. after initial log message
414 // line with critical info, e.g:
415 //"date: 2011/07/02 11:02:54; author: sanda; state: Exp; lines: +17 -2"
420 LYXERR(Debug::LYXVC, line);
421 if (entry && prefixIs(line, "date:")) {
425 if (prefixIs(line, "revision"))
431 rev_date_cache_ = token(result, ' ', 1);
432 rev_time_cache_ = rtrim(token(result, ' ', 2), ";");
433 rev_author_cache_ = trim(token(token(result, ';', 1), ':', 1));
435 return !rev_author_cache_.empty();
438 bool RCS::prepareFileRevision(string const &revis, string & f)
441 if (!VCS::makeRCSRevision(version_, rev))
444 FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_");
446 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
450 doVCCommand("co -p" + rev + " "
451 + quoteName(onlyFileName(owner_->absFileName()))
452 + " > " + quoteName(tmpf.toFilesystemEncoding()),
453 FileName(owner_->filePath()));
454 if (tmpf.isFileEmpty())
457 f = tmpf.absFileName();
462 bool RCS::prepareFileRevisionEnabled()
468 /////////////////////////////////////////////////////////////////////
472 /////////////////////////////////////////////////////////////////////
474 CVS::CVS(FileName const & m, FileName const & f)
478 have_rev_info_ = false;
483 FileName const CVS::findFile(FileName const & file)
485 // First we look for the CVS/Entries in the same dir
486 // where we have file.
487 FileName const entries(onlyPath(file.absFileName()) + "/CVS/Entries");
488 string const tmpf = '/' + onlyFileName(file.absFileName()) + '/';
489 LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under cvs in `" << entries
490 << "' for `" << tmpf << '\'');
491 if (entries.isReadableFile()) {
492 // Ok we are at least in a CVS dir. Parse the CVS/Entries
493 // and see if we can find this file. We do a fast and
495 ifstream ifs(entries.toFilesystemEncoding().c_str());
497 while (getline(ifs, line)) {
498 LYXERR(Debug::LYXVC, "\tEntries: " << line);
499 if (contains(line, tmpf))
507 void CVS::scanMaster()
509 LYXERR(Debug::LYXVC, "LyXVC::CVS: scanMaster. \n Checking: " << master_);
510 // Ok now we do the real scan...
511 ifstream ifs(master_.toFilesystemEncoding().c_str());
512 string name = onlyFileName(file_.absFileName());
513 string tmpf = '/' + name + '/';
514 LYXERR(Debug::LYXVC, "\tlooking for `" << tmpf << '\'');
516 static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
517 while (getline(ifs, line)) {
518 LYXERR(Debug::LYXVC, "\t line: " << line);
519 if (contains(line, tmpf)) {
520 // Ok extract the fields.
523 regex_match(line, sm, reg);
525 //sm[0]; // whole matched string
527 version_ = sm.str(2);
528 string const file_date = sm.str(3);
531 //sm[5]; // tag or tagdate
532 if (file_.isReadableFile()) {
533 time_t mod = file_.lastModified();
534 string mod_date = rtrim(asctime(gmtime(&mod)), "\n");
535 LYXERR(Debug::LYXVC, "Date in Entries: `" << file_date
536 << "'\nModification date of file: `" << mod_date << '\'');
537 if (file_.isReadOnly()) {
538 // readonly checkout is unlocked
541 FileName bdir(addPath(master_.onlyPath().absFileName(),"Base"));
542 FileName base(addName(bdir.absFileName(),name));
543 // if base version is existent "cvs edit" was used to lock
544 vcstatus = base.isReadableFile() ? LOCKED : NOLOCKING;
547 vcstatus = NOLOCKING;
555 string const CVS::getTarget(OperationMode opmode) const
559 // in client server mode CVS does not like full path operand for directory operation
560 // since LyX switches to the repo dir "." is good enough as target
563 return quoteName(onlyFileName(owner_->absFileName()));
569 docstring CVS::toString(CvsStatus status) const
573 return _("Up-to-date");
574 case LocallyModified:
575 return _("Locally Modified");
577 return _("Locally Added");
579 return _("Needs Merge");
581 return _("Needs Checkout");
583 return _("No CVS file");
585 return _("Cannot retrieve CVS status");
591 int CVS::doVCCommandWithOutput(string const & cmd, FileName const & path,
592 FileName const & output, bool reportError)
594 string redirection = output.empty() ? "" : " > " + quoteName(output.toFilesystemEncoding());
595 return doVCCommand(cmd + redirection, path, reportError);
599 int CVS::doVCCommandCallWithOutput(std::string const & cmd,
600 support::FileName const & path,
601 support::FileName const & output)
603 string redirection = output.empty() ? "" : " > " + quoteName(output.toFilesystemEncoding());
604 return doVCCommandCall(cmd + redirection, path);
608 CVS::CvsStatus CVS::getStatus()
610 FileName tmpf = FileName::tempName("lyxvcout");
612 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
616 if (doVCCommandCallWithOutput("cvs status " + getTarget(File),
617 FileName(owner_->filePath()), tmpf)) {
622 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
623 CvsStatus status = NoCvsFile;
628 LYXERR(Debug::LYXVC, line << "\n");
629 if (prefixIs(line, "File:")) {
630 if (contains(line, "Up-to-date"))
632 else if (contains(line, "Locally Modified"))
633 status = LocallyModified;
634 else if (contains(line, "Locally Added"))
635 status = LocallyAdded;
636 else if (contains(line, "Needs Merge"))
638 else if (contains(line, "Needs Checkout"))
639 status = NeedsCheckout;
646 void CVS::getRevisionInfo()
650 have_rev_info_ = true;
651 FileName tmpf = FileName::tempName("lyxvcout");
653 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
657 int rc = doVCCommandCallWithOutput("cvs log -r" + version_
658 + " " + getTarget(File),
659 FileName(owner_->filePath()), tmpf);
662 LYXERR(Debug::LYXVC, "cvs log failed with exit code " << rc);
666 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
667 static regex const reg("date: (.*) (.*) (.*); author: (.*); state: (.*);(.*)");
672 LYXERR(Debug::LYXVC, line << "\n");
673 if (prefixIs(line, "date:")) {
675 regex_match(line, sm, reg);
676 //sm[0]; // whole matched string
677 rev_date_cache_ = sm[1];
678 rev_time_cache_ = sm[2];
679 //sm[3]; // GMT offset
680 rev_author_cache_ = sm[4];
685 if (rev_author_cache_.empty())
687 "Could not retrieve revision info for " << version_ <<
688 " of " << getTarget(File));
692 void CVS::registrer(string const & msg)
694 doVCCommand("cvs -q add -m \"" + msg + "\" "
696 FileName(owner_->filePath()));
700 void CVS::getDiff(OperationMode opmode, FileName const & tmpf)
702 doVCCommandWithOutput("cvs diff " + getTarget(opmode),
703 FileName(owner_->filePath()), tmpf, false);
710 return doVCCommand("cvs -q edit " + getTarget(File),
711 FileName(owner_->filePath()));
718 return doVCCommand("cvs -q unedit " + getTarget(File),
719 FileName(owner_->filePath()));
723 int CVS::update(OperationMode opmode, FileName const & tmpf)
725 return doVCCommandWithOutput("cvs -q update "
727 FileName(owner_->filePath()), tmpf, false);
731 string CVS::scanLogFile(FileName const & f, string & status)
733 ifstream ifs(f.toFilesystemEncoding().c_str());
738 LYXERR(Debug::LYXVC, line << "\n");
740 status += line + "; ";
741 if (prefixIs(line, "C ")) {
751 string CVS::checkIn(string const & msg)
753 CvsStatus status = getStatus();
756 if (vcstatus != NOLOCKING)
758 return "CVS: Proceeded";
759 case LocallyModified:
761 int rc = doVCCommand("cvs -q commit -m \"" + msg + "\" "
763 FileName(owner_->filePath()));
764 return rc ? string() : "CVS: Proceeded";
768 frontend::Alert::error(_("Revision control error."),
769 _("The repository version is newer then the current check out.\n"
770 "You have to update from repository first or revert your changes.")) ;
773 frontend::Alert::error(_("Revision control error."),
774 bformat(_("Bad status when checking in changes.\n"
783 bool CVS::isLocked() const
785 FileName fn(owner_->absFileName());
787 return !fn.isReadOnly();
791 bool CVS::checkInEnabled()
793 if (vcstatus != NOLOCKING)
800 bool CVS::isCheckInWithConfirmation()
802 CvsStatus status = getStatus();
803 return status == LocallyModified || status == LocallyAdded;
807 string CVS::checkOut()
809 if (vcstatus != NOLOCKING && edit())
811 FileName tmpf = FileName::tempName("lyxvcout");
813 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
817 int rc = update(File, tmpf);
819 string const res = scanLogFile(tmpf, log);
821 frontend::Alert::error(_("Revision control error."),
822 bformat(_("Error when updating from repository.\n"
823 "You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n"
824 "After pressing OK, LyX will try to reopen the resolved document."),
825 from_local8bit(res)));
830 return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
834 bool CVS::checkOutEnabled()
836 if (vcstatus != NOLOCKING)
843 string CVS::repoUpdate()
845 FileName tmpf = FileName::tempName("lyxvcout");
847 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
851 getDiff(Directory, tmpf);
852 docstring res = tmpf.fileContents("UTF-8");
854 LYXERR(Debug::LYXVC, "Diff detected:\n" << res);
855 docstring const file = from_utf8(owner_->filePath());
856 docstring text = bformat(_("There were detected changes "
857 "in the working directory:\n%1$s\n\n"
858 "Possible file conflicts must be then resolved manually "
859 "or you will need to revert back to the repository version."), file);
860 int ret = frontend::Alert::prompt(_("Changes detected"),
861 text, 0, 1, _("&Continue"), _("&Abort"), _("View &Log ..."));
863 dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
864 ret = frontend::Alert::prompt(_("Changes detected"),
865 text, 0, 1, _("&Continue"), _("&Abort"));
866 hideDialogs("file", 0);
874 int rc = update(Directory, tmpf);
875 res += "Update log:\n" + tmpf.fileContents("UTF-8");
876 LYXERR(Debug::LYXVC, res);
879 string sres = scanLogFile(tmpf, log);
881 docstring const file = owner_->fileName().displayName(20);
882 frontend::Alert::error(_("Revision control error."),
883 bformat(_("Error when updating document %1$s from repository.\n"
884 "You have to manually resolve the conflicts NOW!\n'%2$s'.\n\n"
885 "After pressing OK, LyX will try to reopen the resolved document."),
886 file, from_local8bit(sres)));
892 return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
896 bool CVS::repoUpdateEnabled()
902 string CVS::lockingToggle()
904 lyxerr << "Sorry, not implemented." << endl;
909 bool CVS::lockingToggleEnabled()
915 bool CVS::isRevertWithConfirmation()
917 CvsStatus status = getStatus();
918 return !owner_->isClean() || status == LocallyModified || status == NeedsMerge;
924 // Reverts to the version in CVS repository and
925 // gets the updated version from the repository.
926 CvsStatus status = getStatus();
929 if (vcstatus != NOLOCKING)
930 return 0 == unedit();
934 case LocallyModified: {
935 FileName f(owner_->absFileName());
937 update(File, FileName());
942 docstring const file = owner_->fileName().displayName(20);
943 frontend::Alert::error(_("Revision control error."),
944 bformat(_("The document %1$s is not in repository.\n"
945 "You have to check in the first revision before you can revert."),
950 docstring const file = owner_->fileName().displayName(20);
951 frontend::Alert::error(_("Revision control error."),
952 bformat(_("Cannot revert document %1$s to repository version.\n"
953 "The status '%2$s' is unexpected."),
954 file, toString(status)));
964 // merge the current with the previous version
965 // in a reverse patch kind of way, so that the
966 // result is to revert the last changes.
967 lyxerr << "Sorry, not implemented." << endl;
971 bool CVS::undoLastEnabled()
977 void CVS::getLog(FileName const & tmpf)
979 doVCCommandWithOutput("cvs log " + getTarget(File),
980 FileName(owner_->filePath()),
985 bool CVS::toggleReadOnlyEnabled()
991 string CVS::revisionInfo(LyXVC::RevisionInfo const info)
993 if (!version_.empty()) {
999 return rev_author_cache_;
1001 return rev_date_cache_;
1003 return rev_time_cache_;
1011 bool CVS::prepareFileRevision(string const & revis, string & f)
1014 if (!VCS::makeRCSRevision(version_, rev))
1017 FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_");
1019 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1023 doVCCommandWithOutput("cvs update -p -r" + rev + " "
1025 FileName(owner_->filePath()), tmpf);
1026 if (tmpf.isFileEmpty())
1029 f = tmpf.absFileName();
1034 bool CVS::prepareFileRevisionEnabled()
1040 /////////////////////////////////////////////////////////////////////
1044 /////////////////////////////////////////////////////////////////////
1046 SVN::SVN(FileName const & m, FileName const & f)
1056 FileName const SVN::findFile(FileName const & file)
1058 // First we check the existence of repository meta data.
1059 if (!VCS::checkparentdirs(file, ".svn")) {
1060 LYXERR(Debug::LYXVC, "Cannot find SVN meta data for " << file);
1064 // Now we check the status of the file.
1065 FileName tmpf = FileName::tempName("lyxvcout");
1067 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1071 string const fname = onlyFileName(file.absFileName());
1072 LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under svn control for `" << fname << '\'');
1073 bool found = 0 == doVCCommandCall("svn info " + quoteName(fname)
1074 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1076 LYXERR(Debug::LYXVC, "SVN control: " << (found ? "enabled" : "disabled"));
1077 return found ? file : FileName();
1081 void SVN::scanMaster()
1083 // vcstatus code is somewhat superflous, until we want
1084 // to implement read-only toggle for svn.
1085 vcstatus = NOLOCKING;
1086 if (checkLockMode()) {
1090 vcstatus = UNLOCKED;
1096 bool SVN::checkLockMode()
1098 FileName tmpf = FileName::tempName("lyxvcout");
1100 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1104 LYXERR(Debug::LYXVC, "Detecting locking mode...");
1105 if (doVCCommandCall("svn proplist " + quoteName(file_.onlyFileName())
1106 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1110 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1114 while (ifs && !ret) {
1116 LYXERR(Debug::LYXVC, line);
1117 if (contains(line, "svn:needs-lock"))
1120 LYXERR(Debug::LYXVC, "Locking enabled: " << ret);
1128 bool SVN::isLocked() const
1131 return !file_.isReadOnly();
1135 void SVN::registrer(string const & /*msg*/)
1137 doVCCommand("svn add -q " + quoteName(onlyFileName(owner_->absFileName())),
1138 FileName(owner_->filePath()));
1142 string SVN::checkIn(string const & msg)
1144 FileName tmpf = FileName::tempName("lyxvcout");
1146 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1147 return N_("Error: Could not generate logfile.");
1150 doVCCommand("svn commit -m \"" + msg + "\" "
1151 + quoteName(onlyFileName(owner_->absFileName()))
1152 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1153 FileName(owner_->filePath()));
1156 string res = scanLogFile(tmpf, log);
1158 frontend::Alert::error(_("Revision control error."),
1159 _("Error when committing to repository.\n"
1160 "You have to manually resolve the problem.\n"
1161 "LyX will reopen the document after you press OK."));
1163 fileLock(false, tmpf, log);
1166 return log.empty() ? string() : "SVN: " + log;
1170 bool SVN::checkInEnabled()
1179 bool SVN::isCheckInWithConfirmation()
1181 // FIXME one day common getDiff and perhaps OpMode for all backends
1183 FileName tmpf = FileName::tempName("lyxvcout");
1185 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1189 doVCCommandCall("svn diff " + quoteName(owner_->absFileName())
1190 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1191 FileName(owner_->filePath()));
1193 docstring diff = tmpf.fileContents("UTF-8");
1203 // FIXME Correctly return code should be checked instead of this.
1204 // This would need another solution than just plain startscript.
1205 // Hint from Andre': QProcess::readAllStandardError()...
1206 string SVN::scanLogFile(FileName const & f, string & status)
1208 ifstream ifs(f.toFilesystemEncoding().c_str());
1213 LYXERR(Debug::LYXVC, line << "\n");
1215 status += line + "; ";
1216 if (prefixIs(line, "C ") || prefixIs(line, "CU ")
1217 || contains(line, "Commit failed")) {
1221 if (contains(line, "svn:needs-lock")) {
1231 void SVN::fileLock(bool lock, FileName const & tmpf, string &status)
1233 if (!locked_mode_ || (isLocked() == lock))
1236 string const arg = lock ? "lock " : "unlock ";
1237 doVCCommand("svn "+ arg + quoteName(onlyFileName(owner_->absFileName()))
1238 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1239 FileName(owner_->filePath()));
1241 // Lock error messages go unfortunately on stderr and are unreachible this way.
1242 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1246 if (!line.empty()) status += line + "; ";
1250 if (!isLocked() && lock)
1251 frontend::Alert::error(_("Revision control error."),
1252 _("Error while acquiring write lock.\n"
1253 "Another user is most probably editing\n"
1254 "the current document now!\n"
1255 "Also check the access to the repository."));
1256 if (isLocked() && !lock)
1257 frontend::Alert::error(_("Revision control error."),
1258 _("Error while releasing write lock.\n"
1259 "Check the access to the repository."));
1263 string SVN::checkOut()
1265 FileName tmpf = FileName::tempName("lyxvcout");
1267 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1268 return N_("Error: Could not generate logfile.");
1271 doVCCommand("svn update --non-interactive " + quoteName(onlyFileName(owner_->absFileName()))
1272 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1273 FileName(owner_->filePath()));
1276 string const res = scanLogFile(tmpf, log);
1278 frontend::Alert::error(_("Revision control error."),
1279 bformat(_("Error when updating from repository.\n"
1280 "You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n"
1281 "After pressing OK, LyX will try to reopen the resolved document."),
1282 from_local8bit(res)));
1284 fileLock(true, tmpf, log);
1287 return log.empty() ? string() : "SVN: " + log;
1291 bool SVN::checkOutEnabled()
1300 string SVN::repoUpdate()
1302 FileName tmpf = FileName::tempName("lyxvcout");
1304 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1305 return N_("Error: Could not generate logfile.");
1308 doVCCommand("svn diff " + quoteName(owner_->filePath())
1309 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1310 FileName(owner_->filePath()));
1311 docstring res = tmpf.fileContents("UTF-8");
1313 LYXERR(Debug::LYXVC, "Diff detected:\n" << res);
1314 docstring const file = from_utf8(owner_->filePath());
1315 docstring text = bformat(_("There were detected changes "
1316 "in the working directory:\n%1$s\n\n"
1317 "In case of file conflict version of the local directory files "
1318 "will be preferred."
1319 "\n\nContinue?"), file);
1320 int ret = frontend::Alert::prompt(_("Changes detected"),
1321 text, 0, 1, _("&Yes"), _("&No"), _("View &Log ..."));
1323 dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
1324 ret = frontend::Alert::prompt(_("Changes detected"),
1325 text, 0, 1, _("&Yes"), _("&No"));
1326 hideDialogs("file", 0);
1334 // Reverting looks too harsh, see bug #6255.
1335 // doVCCommand("svn revert -R " + quoteName(owner_->filePath())
1336 // + " > " + quoteName(tmpf.toFilesystemEncoding()),
1337 // FileName(owner_->filePath()));
1338 // res = "Revert log:\n" + tmpf.fileContents("UTF-8");
1339 doVCCommand("svn update --accept mine-full " + quoteName(owner_->filePath())
1340 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1341 FileName(owner_->filePath()));
1342 res += "Update log:\n" + tmpf.fileContents("UTF-8");
1344 LYXERR(Debug::LYXVC, res);
1346 return to_utf8(res);
1350 bool SVN::repoUpdateEnabled()
1356 string SVN::lockingToggle()
1358 FileName tmpf = FileName::tempName("lyxvcout");
1360 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1361 return N_("Error: Could not generate logfile.");
1364 int ret = doVCCommand("svn proplist " + quoteName(onlyFileName(owner_->absFileName()))
1365 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1366 FileName(owner_->filePath()));
1371 string res = scanLogFile(tmpf, log);
1372 bool locking = contains(res, "svn:needs-lock");
1374 ret = doVCCommand("svn propset svn:needs-lock ON "
1375 + quoteName(onlyFileName(owner_->absFileName()))
1376 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1377 FileName(owner_->filePath()));
1379 ret = doVCCommand("svn propdel svn:needs-lock "
1380 + quoteName(onlyFileName(owner_->absFileName()))
1381 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1382 FileName(owner_->filePath()));
1387 frontend::Alert::warning(_("VCN File Locking"),
1388 (locking ? _("Locking property unset.") : _("Locking property set.")) + "\n"
1389 + _("Do not forget to commit the locking property into the repository."),
1392 return string("SVN: ") + N_("Locking property set.");
1396 bool SVN::lockingToggleEnabled()
1404 // Reverts to the version in SVN repository and
1405 // gets the updated version from the repository.
1406 string const fil = quoteName(onlyFileName(owner_->absFileName()));
1408 if (doVCCommand("svn revert -q " + fil,
1409 FileName(owner_->filePath())))
1411 owner_->markClean();
1416 bool SVN::isRevertWithConfirmation()
1418 //FIXME owner && diff
1423 void SVN::undoLast()
1425 // merge the current with the previous version
1426 // in a reverse patch kind of way, so that the
1427 // result is to revert the last changes.
1428 lyxerr << "Sorry, not implemented." << endl;
1432 bool SVN::undoLastEnabled()
1438 string SVN::revisionInfo(LyXVC::RevisionInfo const info)
1440 if (info == LyXVC::Tree) {
1441 if (rev_tree_cache_.empty())
1442 if (!getTreeRevisionInfo())
1443 rev_tree_cache_ = "?";
1444 if (rev_tree_cache_ == "?")
1447 return rev_tree_cache_;
1450 // fill the rest of the attributes for a single file
1451 if (rev_file_cache_.empty())
1452 if (!getFileRevisionInfo())
1453 rev_file_cache_ = "?";
1457 if (rev_file_cache_ == "?")
1459 return rev_file_cache_;
1461 return rev_author_cache_;
1463 return rev_date_cache_;
1465 return rev_time_cache_;
1474 bool SVN::getFileRevisionInfo()
1476 FileName tmpf = FileName::tempName("lyxvcout");
1478 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1482 doVCCommand("svn info --xml " + quoteName(onlyFileName(owner_->absFileName()))
1483 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1484 FileName(owner_->filePath()));
1489 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1497 LYXERR(Debug::LYXVC, line);
1498 if (prefixIs(line, "<commit"))
1500 if (c && prefixIs(line, " revision=\"") && suffixIs(line, "\">")) {
1501 string l1 = subst(line, "revision=\"", "");
1502 string l2 = trim(subst(l1, "\">", ""));
1504 rev_file_cache_ = rev = l2;
1506 if (c && prefixIs(line, "<author>") && suffixIs(line, "</author>")) {
1507 string l1 = subst(line, "<author>", "");
1508 string l2 = subst(l1, "</author>", "");
1509 rev_author_cache_ = l2;
1511 if (c && prefixIs(line, "<date>") && suffixIs(line, "</date>")) {
1512 string l1 = subst(line, "<date>", "");
1513 string l2 = subst(l1, "</date>", "");
1514 l2 = split(l2, l1, 'T');
1515 rev_date_cache_ = l1;
1516 l2 = split(l2, l1, '.');
1517 rev_time_cache_ = l1;
1523 return !rev.empty();
1527 bool SVN::getTreeRevisionInfo()
1529 FileName tmpf = FileName::tempName("lyxvcout");
1531 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1535 doVCCommand("svnversion -n . > " + quoteName(tmpf.toFilesystemEncoding()),
1536 FileName(owner_->filePath()));
1541 // only first line in case something bad happens.
1542 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1548 rev_tree_cache_ = line;
1549 return !line.empty();
1553 void SVN::getLog(FileName const & tmpf)
1555 doVCCommand("svn log " + quoteName(onlyFileName(owner_->absFileName()))
1556 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1557 FileName(owner_->filePath()));
1561 bool SVN::prepareFileRevision(string const & revis, string & f)
1563 if (!isStrInt(revis))
1566 int rev = convert<int>(revis);
1568 if (!getFileRevisionInfo())
1571 rev = convert<int>(rev_file_cache_);
1572 // go back for minus rev
1574 rev = rev + convert<int>(rev_file_cache_);
1579 string revname = convert<string>(rev);
1580 FileName tmpf = FileName::tempName("lyxvcrev_" + revname + "_");
1582 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1586 doVCCommand("svn cat -r " + revname + " "
1587 + quoteName(onlyFileName(owner_->absFileName()))
1588 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1589 FileName(owner_->filePath()));
1590 if (tmpf.isFileEmpty())
1593 f = tmpf.absFileName();
1598 bool SVN::prepareFileRevisionEnabled()
1605 bool SVN::toggleReadOnlyEnabled()