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/PathChanger.h"
28 #include "support/Systemcall.h"
29 #include "support/TempFile.h"
37 using namespace lyx::support;
43 int VCS::doVCCommandCall(string const & cmd, FileName const & path)
45 LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd);
47 support::PathChanger p(path);
48 return one.startscript(Systemcall::Wait, cmd, string(), string(), false);
52 int VCS::doVCCommand(string const & cmd, FileName const & path, bool reportError)
55 owner_->setBusy(true);
57 int const ret = doVCCommandCall(cmd, path);
60 owner_->setBusy(false);
61 if (ret && reportError) {
63 if (prefixIs(cmd, "ci "))
64 rcsmsg = "\n" + _("Perhaps the RCS package is not installed on your system?");
65 frontend::Alert::error(_("Revision control error."),
66 bformat(_("Some problem occurred while running the command:\n"
74 bool VCS::makeRCSRevision(string const &version, string &revis) const
79 int back = convert<int>(rev);
80 // if positive use as the last number in the whole revision string
83 rsplit(version, base , '.');
84 rev = base + '.' + rev;
88 // we care about the last number from revision string
89 // in case of backward indexing
92 cur = rsplit(version, base , '.');
95 int want = convert<int>(cur) + back;
99 rev = base + '.' + convert<string>(want);
108 bool VCS::checkParentDirs(FileName const & file, std::string const & vcsdir)
110 FileName dirname = file.onlyPath();
112 FileName tocheck = FileName(addName(dirname.absFileName(), vcsdir));
113 LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName());
114 if (tocheck.exists())
116 //this construct because of #8295
117 dirname = FileName(dirname.absFileName()).parentPath();
118 } while (!dirname.empty());
123 /////////////////////////////////////////////////////////////////////
127 /////////////////////////////////////////////////////////////////////
129 RCS::RCS(FileName const & m, Buffer * b) : VCS(b)
131 // Here we know that the buffer file is either already in RCS or
132 // about to be registered
138 FileName const RCS::findFile(FileName const & file)
140 // Check if *,v exists.
141 FileName tmp(file.absFileName() + ",v");
142 LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
143 if (tmp.isReadableFile()) {
144 LYXERR(Debug::LYXVC, "Yes, " << file << " is under rcs.");
148 // Check if RCS/*,v exists.
149 tmp = FileName(addName(addPath(onlyPath(file.absFileName()), "RCS"), file.absFileName()) + ",v");
150 LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
151 if (tmp.isReadableFile()) {
152 LYXERR(Debug::LYXVC, "Yes, " << file << " is under rcs.");
160 bool RCS::retrieve(FileName const & file)
162 LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file);
163 // The caller ensures that file does not exist, so no need to check that.
164 return doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()),
169 void RCS::scanMaster()
174 LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster: " << master_);
176 ifstream ifs(master_.toFilesystemEncoding().c_str());
177 // limit the size of strings we read to avoid memory problems
181 bool read_enough = false;
183 while (!read_enough && ifs >> token) {
184 LYXERR(Debug::LYXVC, "LyXVC::scanMaster: current lex text: `"
189 else if (token == "head") {
193 tmv = rtrim(tmv, ";");
195 LYXERR(Debug::LYXVC, "LyXVC: version found to be " << tmv);
196 } else if (contains(token, "access")
197 || contains(token, "symbols")
198 || contains(token, "strict")) {
200 } else if (contains(token, "locks")) {
202 if (contains(token, ';')) {
203 locker_ = "Unlocked";
212 s1 = rtrim(tmpt, ";");
213 // tmp is now in the format <user>:<version>
214 s1 = split(s1, s2, ':');
215 // s2 is user, and s1 is version
216 if (s1 == version_) {
221 } while (!contains(tmpt, ';'));
223 } else if (token == "comment") {
224 // we don't need to read any further than this.
228 LYXERR(Debug::LYXVC, "LyXVC::scanMaster(): unexpected token");
234 void RCS::registrer(string const & msg)
236 string cmd = "ci -q -u -i -t-\"";
239 cmd += quoteName(onlyFileName(owner_->absFileName()));
240 doVCCommand(cmd, FileName(owner_->filePath()));
244 bool RCS::renameEnabled()
250 string RCS::rename(support::FileName const & /*newFile*/, string const & /*msg*/)
252 // not implemented, since a left-over file.lyx,v would be confusing.
257 bool RCS::copyEnabled()
263 string RCS::copy(support::FileName const & newFile, string const & msg)
265 // RCS has no real copy command, so we create a poor mans version
266 support::FileName const oldFile(owner_->absFileName());
267 if (!oldFile.copyTo(newFile))
269 FileName path(oldFile.onlyPath());
270 string relFile(to_utf8(newFile.relPath(path.absFileName())));
271 string cmd = "ci -q -u -i -t-\"";
274 cmd += quoteName(relFile);
275 return doVCCommand(cmd, path) ? string() : "RCS: Proceeded";
279 LyXVC::CommandResult RCS::checkIn(string const & msg, string & log)
281 int ret = doVCCommand("ci -q -u -m\"" + msg + "\" "
282 + quoteName(onlyFileName(owner_->absFileName())),
283 FileName(owner_->filePath()));
285 return LyXVC::ErrorCommand;
286 log = "RCS: Proceeded";
287 return LyXVC::VCSuccess;
291 bool RCS::checkInEnabled()
293 return owner_ && !owner_->hasReadonlyFlag();
297 bool RCS::isCheckInWithConfirmation()
299 // FIXME one day common getDiff for all backends
301 // if (getDiff(file, diff) && diff.empty())
304 TempFile tempfile("lyxvcout");
305 FileName tmpf = tempfile.name();
307 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
311 doVCCommandCall("rcsdiff " + quoteName(owner_->absFileName())
312 + " > " + quoteName(tmpf.toFilesystemEncoding()),
313 FileName(owner_->filePath()));
315 docstring diff = tmpf.fileContents("UTF-8");
324 string RCS::checkOut()
327 int ret = doVCCommand("co -q -l " + quoteName(onlyFileName(owner_->absFileName())),
328 FileName(owner_->filePath()));
329 return ret ? string() : "RCS: Proceeded";
333 bool RCS::checkOutEnabled()
335 return owner_ && owner_->hasReadonlyFlag();
339 string RCS::repoUpdate()
341 lyxerr << "Sorry, not implemented." << endl;
346 bool RCS::repoUpdateEnabled()
352 string RCS::lockingToggle()
354 //FIXME this might be actually possible, study rcs -U, rcs -L.
355 //State should be easy to get inside scanMaster.
356 //It would fix #4370 and make rcs/svn usage even more closer.
357 lyxerr << "Sorry, not implemented." << endl;
362 bool RCS::lockingToggleEnabled()
370 if (doVCCommand("co -f -u" + version_ + ' '
371 + quoteName(onlyFileName(owner_->absFileName())),
372 FileName(owner_->filePath())))
374 // We ignore changes and just reload!
380 bool RCS::isRevertWithConfirmation()
382 //FIXME owner && diff ?
389 LYXERR(Debug::LYXVC, "LyXVC: undoLast");
390 doVCCommand("rcs -o" + version_ + ' '
391 + quoteName(onlyFileName(owner_->absFileName())),
392 FileName(owner_->filePath()));
396 bool RCS::undoLastEnabled()
398 return owner_->hasReadonlyFlag();
402 void RCS::getLog(FileName const & tmpf)
404 doVCCommand("rlog " + quoteName(onlyFileName(owner_->absFileName()))
405 + " > " + quoteName(tmpf.toFilesystemEncoding()),
406 FileName(owner_->filePath()));
410 bool RCS::toggleReadOnlyEnabled()
412 // This got broken somewhere along lfuns dispatch reorganization.
413 // reloadBuffer would be needed after this, but thats problematic
414 // since we are inside Buffer::dispatch.
420 string RCS::revisionInfo(LyXVC::RevisionInfo const info)
422 if (info == LyXVC::File)
424 // fill the rest of the attributes for a single file
425 if (rev_date_cache_.empty())
426 if (!getRevisionInfo())
431 return rev_author_cache_;
433 return rev_date_cache_;
435 return rev_time_cache_;
444 bool RCS::getRevisionInfo()
446 TempFile tempfile("lyxvcout");
447 FileName tmpf = tempfile.name();
449 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
452 doVCCommand("rlog -r " + quoteName(onlyFileName(owner_->absFileName()))
453 + " > " + quoteName(tmpf.toFilesystemEncoding()),
454 FileName(owner_->filePath()));
459 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
462 // we reached to the entry, i.e. after initial log message
464 // line with critical info, e.g:
465 //"date: 2011/07/02 11:02:54; author: sanda; state: Exp; lines: +17 -2"
470 LYXERR(Debug::LYXVC, line);
471 if (entry && prefixIs(line, "date:")) {
475 if (prefixIs(line, "revision"))
481 rev_date_cache_ = token(result, ' ', 1);
482 rev_time_cache_ = rtrim(token(result, ' ', 2), ";");
483 rev_author_cache_ = trim(token(token(result, ';', 1), ':', 1));
485 return !rev_author_cache_.empty();
488 bool RCS::prepareFileRevision(string const &revis, string & f)
491 if (!VCS::makeRCSRevision(version_, rev))
494 TempFile tempfile("lyxvcrev_" + rev + '_');
495 tempfile.setAutoRemove(false);
496 FileName tmpf = tempfile.name();
498 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
502 doVCCommand("co -p" + rev + ' '
503 + quoteName(onlyFileName(owner_->absFileName()))
504 + " > " + quoteName(tmpf.toFilesystemEncoding()),
505 FileName(owner_->filePath()));
507 if (tmpf.isFileEmpty())
510 f = tmpf.absFileName();
515 bool RCS::prepareFileRevisionEnabled()
521 /////////////////////////////////////////////////////////////////////
525 /////////////////////////////////////////////////////////////////////
527 CVS::CVS(FileName const & m, Buffer * b) : VCS(b)
529 // Here we know that the buffer file is either already in CVS or
530 // about to be registered
532 have_rev_info_ = false;
537 FileName const CVS::findFile(FileName const & file)
539 // First we look for the CVS/Entries in the same dir
540 // where we have file.
541 // Note that it is not necessary to search parent directories, since
542 // there will be a CVS/Entries file in every subdirectory.
543 FileName const entries(onlyPath(file.absFileName()) + "/CVS/Entries");
544 string const tmpf = '/' + onlyFileName(file.absFileName()) + '/';
545 LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under cvs in `" << entries
546 << "' for `" << tmpf << '\'');
547 if (entries.isReadableFile()) {
548 // Ok we are at least in a CVS dir. Parse the CVS/Entries
549 // and see if we can find this file. We do a fast and
551 ifstream ifs(entries.toFilesystemEncoding().c_str());
553 while (getline(ifs, line)) {
554 LYXERR(Debug::LYXVC, "\tEntries: " << line);
555 if (contains(line, tmpf))
563 void CVS::scanMaster()
565 LYXERR(Debug::LYXVC, "LyXVC::CVS: scanMaster. \n Checking: " << master_);
566 // Ok now we do the real scan...
567 ifstream ifs(master_.toFilesystemEncoding().c_str());
568 string name = onlyFileName(owner_->absFileName());
569 string tmpf = '/' + name + '/';
570 LYXERR(Debug::LYXVC, "\tlooking for `" << tmpf << '\'');
572 static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
573 while (getline(ifs, line)) {
574 LYXERR(Debug::LYXVC, "\t line: " << line);
575 if (contains(line, tmpf)) {
576 // Ok extract the fields.
578 if (!regex_match(line, sm, reg)) {
579 LYXERR(Debug::LYXVC, "\t Cannot parse line. Skipping.");
583 //sm[0]; // whole matched string
585 version_ = sm.str(2);
586 string const file_date = sm.str(3);
589 //sm[5]; // tag or tagdate
590 FileName file(owner_->absFileName());
591 if (file.isReadableFile()) {
592 time_t mod = file.lastModified();
593 string mod_date = rtrim(asctime(gmtime(&mod)), "\n");
594 LYXERR(Debug::LYXVC, "Date in Entries: `" << file_date
595 << "'\nModification date of file: `" << mod_date << '\'');
596 if (file.isReadOnly()) {
597 // readonly checkout is unlocked
600 FileName bdir(addPath(master_.onlyPath().absFileName(),"Base"));
601 FileName base(addName(bdir.absFileName(),name));
602 // if base version is existent "cvs edit" was used to lock
603 vcstatus = base.isReadableFile() ? LOCKED : NOLOCKING;
606 vcstatus = NOLOCKING;
614 bool CVS::retrieve(FileName const & file)
616 LYXERR(Debug::LYXVC, "LyXVC::CVS: retrieve.\n\t" << file);
617 // The caller ensures that file does not exist, so no need to check that.
618 return doVCCommandCall("cvs -q update " + quoteName(file.toFilesystemEncoding()),
619 file.onlyPath()) == 0;
623 string const CVS::getTarget(OperationMode opmode) const
627 // in client server mode CVS does not like full path operand for directory operation
628 // since LyX switches to the repo dir "." is good enough as target
631 return quoteName(onlyFileName(owner_->absFileName()));
637 docstring CVS::toString(CvsStatus status) const
641 return _("Up-to-date");
642 case LocallyModified:
643 return _("Locally Modified");
645 return _("Locally Added");
647 return _("Needs Merge");
649 return _("Needs Checkout");
651 return _("No CVS file");
653 return _("Cannot retrieve CVS status");
659 int CVS::doVCCommandWithOutput(string const & cmd, FileName const & path,
660 FileName const & output, bool reportError)
662 string redirection = output.empty() ? "" : " > " + quoteName(output.toFilesystemEncoding());
663 return doVCCommand(cmd + redirection, path, reportError);
667 int CVS::doVCCommandCallWithOutput(std::string const & cmd,
668 support::FileName const & path,
669 support::FileName const & output)
671 string redirection = output.empty() ? "" : " > " + quoteName(output.toFilesystemEncoding());
672 return doVCCommandCall(cmd + redirection, path);
676 CVS::CvsStatus CVS::getStatus()
678 TempFile tempfile("lyxvout");
679 FileName tmpf = tempfile.name();
681 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
685 if (doVCCommandCallWithOutput("cvs status " + getTarget(File),
686 FileName(owner_->filePath()), tmpf)) {
690 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
691 CvsStatus status = NoCvsFile;
696 LYXERR(Debug::LYXVC, line << '\n');
697 if (prefixIs(line, "File:")) {
698 if (contains(line, "Up-to-date"))
700 else if (contains(line, "Locally Modified"))
701 status = LocallyModified;
702 else if (contains(line, "Locally Added"))
703 status = LocallyAdded;
704 else if (contains(line, "Needs Merge"))
706 else if (contains(line, "Needs Checkout"))
707 status = NeedsCheckout;
713 void CVS::getRevisionInfo()
717 have_rev_info_ = true;
718 TempFile tempfile("lyxvout");
719 FileName tmpf = tempfile.name();
721 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
725 int rc = doVCCommandCallWithOutput("cvs log -r" + version_
726 + ' ' + getTarget(File),
727 FileName(owner_->filePath()), tmpf);
729 LYXERR(Debug::LYXVC, "cvs log failed with exit code " << rc);
733 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
734 static regex const reg("date: (.*) (.*) (.*); author: (.*); state: (.*);(.*)");
739 LYXERR(Debug::LYXVC, line << '\n');
740 if (prefixIs(line, "date:")) {
742 if (regex_match(line, sm, reg)) {
743 //sm[0]; // whole matched string
744 rev_date_cache_ = sm[1];
745 rev_time_cache_ = sm[2];
746 //sm[3]; // GMT offset
747 rev_author_cache_ = sm[4];
749 LYXERR(Debug::LYXVC, "\tCannot parse line. Skipping.");
753 if (rev_author_cache_.empty())
755 "Could not retrieve revision info for " << version_ <<
756 " of " << getTarget(File));
760 void CVS::registrer(string const & msg)
762 doVCCommand("cvs -q add -m \"" + msg + "\" "
764 FileName(owner_->filePath()));
768 bool CVS::renameEnabled()
774 string CVS::rename(support::FileName const & newFile, string const & msg)
776 // CVS has no real rename command, so we create a poor mans version
777 support::FileName const oldFile(owner_->absFileName());
778 string ret = copy(newFile, msg);
781 string cmd = "cvs -q remove -m \"" + msg + "\" " +
782 quoteName(oldFile.onlyFileName());
783 FileName path(oldFile.onlyPath());
784 return doVCCommand(cmd, path) ? string() : ret;
788 bool CVS::copyEnabled()
794 string CVS::copy(support::FileName const & newFile, string const & msg)
796 // CVS has no real copy command, so we create a poor mans version
797 support::FileName const oldFile(owner_->absFileName());
798 if (!oldFile.copyTo(newFile))
800 FileName path(oldFile.onlyPath());
801 string relFile(to_utf8(newFile.relPath(path.absFileName())));
802 string cmd("cvs -q add -m \"" + msg + "\" " + quoteName(relFile));
803 return doVCCommand(cmd, path) ? string() : "CVS: Proceeded";
807 void CVS::getDiff(OperationMode opmode, FileName const & tmpf)
809 doVCCommandWithOutput("cvs diff " + getTarget(opmode),
810 FileName(owner_->filePath()), tmpf, false);
817 return doVCCommand("cvs -q edit " + getTarget(File),
818 FileName(owner_->filePath()));
825 return doVCCommand("cvs -q unedit " + getTarget(File),
826 FileName(owner_->filePath()));
830 int CVS::update(OperationMode opmode, FileName const & tmpf)
832 return doVCCommandWithOutput("cvs -q update "
834 FileName(owner_->filePath()), tmpf, false);
838 string CVS::scanLogFile(FileName const & f, string & status)
840 ifstream ifs(f.toFilesystemEncoding().c_str());
845 LYXERR(Debug::LYXVC, line << '\n');
847 status += line + "; ";
848 if (prefixIs(line, "C ")) {
858 LyXVC::CommandResult CVS::checkIn(string const & msg, string & log)
860 CvsStatus status = getStatus();
863 if (vcstatus != NOLOCKING)
865 return LyXVC::ErrorCommand;
866 log = "CVS: Proceeded";
867 return LyXVC::VCSuccess;
868 case LocallyModified:
870 int rc = doVCCommand("cvs -q commit -m \"" + msg + "\" "
872 FileName(owner_->filePath()));
874 return LyXVC::ErrorCommand;
875 log = "CVS: Proceeded";
876 return LyXVC::VCSuccess;
880 frontend::Alert::error(_("Revision control error."),
881 _("The repository version is newer then the current check out.\n"
882 "You have to update from repository first or revert your changes.")) ;
885 frontend::Alert::error(_("Revision control error."),
886 bformat(_("Bad status when checking in changes.\n"
891 return LyXVC::ErrorBefore;
895 bool CVS::isLocked() const
897 FileName fn(owner_->absFileName());
899 return !fn.isReadOnly();
903 bool CVS::checkInEnabled()
905 if (vcstatus != NOLOCKING)
912 bool CVS::isCheckInWithConfirmation()
914 CvsStatus status = getStatus();
915 return status == LocallyModified || status == LocallyAdded;
919 string CVS::checkOut()
921 if (vcstatus != NOLOCKING && edit())
923 TempFile tempfile("lyxvout");
924 FileName tmpf = tempfile.name();
926 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
930 int rc = update(File, tmpf);
932 string const res = scanLogFile(tmpf, log);
934 frontend::Alert::error(_("Revision control error."),
935 bformat(_("Error when updating from repository.\n"
936 "You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n"
937 "After pressing OK, LyX will try to reopen the resolved document."),
938 from_local8bit(res)));
942 return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
946 bool CVS::checkOutEnabled()
948 if (vcstatus != NOLOCKING)
955 string CVS::repoUpdate()
957 TempFile tempfile("lyxvout");
958 FileName tmpf = tempfile.name();
960 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
964 getDiff(Directory, tmpf);
965 docstring res = tmpf.fileContents("UTF-8");
967 LYXERR(Debug::LYXVC, "Diff detected:\n" << res);
968 docstring const file = from_utf8(owner_->filePath());
969 docstring text = bformat(_("There were detected changes "
970 "in the working directory:\n%1$s\n\n"
971 "Possible file conflicts must be then resolved manually "
972 "or you will need to revert back to the repository version."), file);
973 int ret = frontend::Alert::prompt(_("Changes detected"),
974 text, 0, 1, _("&Continue"), _("&Abort"), _("View &Log ..."));
976 dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
977 ret = frontend::Alert::prompt(_("Changes detected"),
978 text, 0, 1, _("&Continue"), _("&Abort"));
979 hideDialogs("file", nullptr);
985 int rc = update(Directory, tmpf);
986 res += "Update log:\n" + tmpf.fileContents("UTF-8");
987 LYXERR(Debug::LYXVC, res);
990 string sres = scanLogFile(tmpf, log);
992 docstring const file = owner_->fileName().displayName(20);
993 frontend::Alert::error(_("Revision control error."),
994 bformat(_("Error when updating document %1$s from repository.\n"
995 "You have to manually resolve the conflicts NOW!\n'%2$s'.\n\n"
996 "After pressing OK, LyX will try to reopen the resolved document."),
997 file, from_local8bit(sres)));
1001 return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
1005 bool CVS::repoUpdateEnabled()
1011 string CVS::lockingToggle()
1013 lyxerr << "Sorry, not implemented." << endl;
1018 bool CVS::lockingToggleEnabled()
1024 bool CVS::isRevertWithConfirmation()
1026 CvsStatus status = getStatus();
1027 return !owner_->isClean() || status == LocallyModified || status == NeedsMerge;
1033 // Reverts to the version in CVS repository and
1034 // gets the updated version from the repository.
1035 CvsStatus status = getStatus();
1038 if (vcstatus != NOLOCKING)
1039 return 0 == unedit();
1043 case LocallyModified: {
1044 FileName f(owner_->absFileName());
1046 update(File, FileName());
1047 owner_->markClean();
1050 case LocallyAdded: {
1051 docstring const file = owner_->fileName().displayName(20);
1052 frontend::Alert::error(_("Revision control error."),
1053 bformat(_("The document %1$s is not in repository.\n"
1054 "You have to check in the first revision before you can revert."),
1059 docstring const file = owner_->fileName().displayName(20);
1060 frontend::Alert::error(_("Revision control error."),
1061 bformat(_("Cannot revert document %1$s to repository version.\n"
1062 "The status '%2$s' is unexpected."),
1063 file, toString(status)));
1071 void CVS::undoLast()
1073 // merge the current with the previous version
1074 // in a reverse patch kind of way, so that the
1075 // result is to revert the last changes.
1076 lyxerr << "Sorry, not implemented." << endl;
1080 bool CVS::undoLastEnabled()
1086 void CVS::getLog(FileName const & tmpf)
1088 doVCCommandWithOutput("cvs log " + getTarget(File),
1089 FileName(owner_->filePath()),
1094 bool CVS::toggleReadOnlyEnabled()
1100 string CVS::revisionInfo(LyXVC::RevisionInfo const info)
1102 if (!version_.empty()) {
1108 return rev_author_cache_;
1110 return rev_date_cache_;
1112 return rev_time_cache_;
1121 bool CVS::prepareFileRevision(string const & revis, string & f)
1124 if (!VCS::makeRCSRevision(version_, rev))
1127 TempFile tempfile("lyxvcrev_" + rev + '_');
1128 tempfile.setAutoRemove(false);
1129 FileName tmpf = tempfile.name();
1131 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1135 doVCCommandWithOutput("cvs update -p -r" + rev + ' '
1137 FileName(owner_->filePath()), tmpf);
1139 if (tmpf.isFileEmpty())
1142 f = tmpf.absFileName();
1147 bool CVS::prepareFileRevisionEnabled()
1153 /////////////////////////////////////////////////////////////////////
1157 /////////////////////////////////////////////////////////////////////
1159 SVN::SVN(FileName const & m, Buffer * b) : VCS(b)
1161 // Here we know that the buffer file is either already in SVN or
1162 // about to be registered
1164 locked_mode_ = false;
1169 FileName const SVN::findFile(FileName const & file)
1171 // First we check the existence of repository meta data.
1172 if (!VCS::checkParentDirs(file, ".svn")) {
1173 LYXERR(Debug::LYXVC, "Cannot find SVN meta data for " << file);
1177 // Now we check the status of the file.
1178 TempFile tempfile("lyxvcout");
1179 FileName tmpf = tempfile.name();
1181 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1185 string const fname = onlyFileName(file.absFileName());
1186 LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under svn control for `" << fname << '\'');
1187 bool found = 0 == doVCCommandCall("svn info " + quoteName(fname)
1188 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1190 LYXERR(Debug::LYXVC, "SVN control: " << (found ? "enabled" : "disabled"));
1191 return found ? file : FileName();
1195 void SVN::scanMaster()
1197 // vcstatus code is somewhat superflous,
1198 // until we want to implement read-only toggle for svn.
1199 vcstatus = NOLOCKING;
1200 if (checkLockMode()) {
1204 vcstatus = UNLOCKED;
1209 bool SVN::checkLockMode()
1211 TempFile tempfile("lyxvcout");
1212 FileName tmpf = tempfile.name();
1214 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1218 LYXERR(Debug::LYXVC, "Detecting locking mode...");
1219 if (doVCCommandCall("svn proplist " + quoteName(onlyFileName(owner_->absFileName()))
1220 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1221 FileName(owner_->filePath())))
1224 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1228 while (ifs && !ret) {
1230 LYXERR(Debug::LYXVC, line);
1231 if (contains(line, "svn:needs-lock"))
1234 LYXERR(Debug::LYXVC, "Locking enabled: " << ret);
1242 bool SVN::isLocked() const
1244 FileName file(owner_->absFileName());
1246 return !file.isReadOnly();
1250 bool SVN::retrieve(FileName const & file)
1252 LYXERR(Debug::LYXVC, "LyXVC::SVN: retrieve.\n\t" << file);
1253 // The caller ensures that file does not exist, so no need to check that.
1254 return doVCCommandCall("svn update -q --non-interactive " + quoteName(file.onlyFileName()),
1255 file.onlyPath()) == 0;
1259 void SVN::registrer(string const & /*msg*/)
1261 doVCCommand("svn add -q " + quoteName(onlyFileName(owner_->absFileName())),
1262 FileName(owner_->filePath()));
1266 bool SVN::renameEnabled()
1272 string SVN::rename(support::FileName const & newFile, string const & msg)
1274 // svn move does not require a log message, since it does not commit.
1275 // In LyX we commit immediately afterwards, otherwise it could be
1276 // confusing to the user to have two uncommitted files.
1277 FileName path(owner_->filePath());
1278 string relFile(to_utf8(newFile.relPath(path.absFileName())));
1279 string cmd("svn move -q " + quoteName(onlyFileName(owner_->absFileName())) +
1280 ' ' + quoteName(relFile));
1281 if (doVCCommand(cmd, path)) {
1282 cmd = "svn revert -q " +
1283 quoteName(onlyFileName(owner_->absFileName())) + ' ' +
1285 doVCCommand(cmd, path);
1286 if (newFile.exists())
1287 newFile.removeFile();
1290 vector<support::FileName> f;
1291 f.push_back(owner_->fileName());
1292 f.push_back(newFile);
1294 if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
1295 cmd = "svn revert -q " +
1296 quoteName(onlyFileName(owner_->absFileName())) + ' ' +
1298 doVCCommand(cmd, path);
1299 if (newFile.exists())
1300 newFile.removeFile();
1307 bool SVN::copyEnabled()
1313 string SVN::copy(support::FileName const & newFile, string const & msg)
1315 // svn copy does not require a log message, since it does not commit.
1316 // In LyX we commit immediately afterwards, otherwise it could be
1317 // confusing to the user to have an uncommitted file.
1318 FileName path(owner_->filePath());
1319 string relFile(to_utf8(newFile.relPath(path.absFileName())));
1320 string cmd("svn copy -q " + quoteName(onlyFileName(owner_->absFileName())) +
1321 ' ' + quoteName(relFile));
1322 if (doVCCommand(cmd, path))
1324 vector<support::FileName> f(1, newFile);
1326 if (checkIn(f, msg, log) == LyXVC::VCSuccess)
1332 LyXVC::CommandResult SVN::checkIn(string const & msg, string & log)
1334 vector<support::FileName> f(1, owner_->fileName());
1335 return checkIn(f, msg, log);
1339 LyXVC::CommandResult
1340 SVN::checkIn(vector<support::FileName> const & f, string const & msg, string & log)
1342 TempFile tempfile("lyxvcout");
1343 FileName tmpf = tempfile.name();
1345 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1346 log = N_("Error: Could not generate logfile.");
1347 return LyXVC::ErrorBefore;
1351 os << "svn commit -m \"" << msg << '"';
1352 for (size_t i = 0; i < f.size(); ++i)
1353 os << ' ' << quoteName(f[i].onlyFileName());
1354 os << " > " << quoteName(tmpf.toFilesystemEncoding());
1355 LyXVC::CommandResult ret =
1356 doVCCommand(os.str(), FileName(owner_->filePath())) ?
1357 LyXVC::ErrorCommand : LyXVC::VCSuccess;
1359 string res = scanLogFile(tmpf, log);
1361 frontend::Alert::error(_("Revision control error."),
1362 _("Error when committing to repository.\n"
1363 "You have to manually resolve the problem.\n"
1364 "LyX will reopen the document after you press OK."));
1365 ret = LyXVC::ErrorCommand;
1368 if (!fileLock(false, tmpf, log))
1369 ret = LyXVC::ErrorCommand;
1372 log.insert(0, "SVN: ");
1373 if (ret == LyXVC::VCSuccess && log.empty())
1374 log = "SVN: Proceeded";
1379 bool SVN::checkInEnabled()
1388 bool SVN::isCheckInWithConfirmation()
1390 // FIXME one day common getDiff and perhaps OpMode for all backends
1392 TempFile tempfile("lyxvcout");
1393 FileName tmpf = tempfile.name();
1395 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1399 doVCCommandCall("svn diff " + quoteName(owner_->absFileName())
1400 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1401 FileName(owner_->filePath()));
1403 docstring diff = tmpf.fileContents("UTF-8");
1412 // FIXME Correctly return code should be checked instead of this.
1413 // This would need another solution than just plain startscript.
1414 // Hint from Andre': QProcess::readAllStandardError()...
1415 string SVN::scanLogFile(FileName const & f, string & status)
1417 ifstream ifs(f.toFilesystemEncoding().c_str());
1422 LYXERR(Debug::LYXVC, line << '\n');
1424 status += line + "; ";
1425 if (prefixIs(line, "C ") || prefixIs(line, "CU ")
1426 || contains(line, "Commit failed")) {
1430 if (contains(line, "svn:needs-lock")) {
1440 bool SVN::fileLock(bool lock, FileName const & tmpf, string &status)
1442 if (!locked_mode_ || (isLocked() == lock))
1445 string const arg = lock ? "lock " : "unlock ";
1446 doVCCommand("svn "+ arg + quoteName(onlyFileName(owner_->absFileName()))
1447 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1448 FileName(owner_->filePath()));
1450 // Lock error messages go unfortunately on stderr and are unreachable this way.
1451 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1455 if (!line.empty()) status += line + "; ";
1459 if (isLocked() == lock)
1463 frontend::Alert::error(_("Revision control error."),
1464 _("Error while acquiring write lock.\n"
1465 "Another user is most probably editing\n"
1466 "the current document now!\n"
1467 "Also check the access to the repository."));
1469 frontend::Alert::error(_("Revision control error."),
1470 _("Error while releasing write lock.\n"
1471 "Check the access to the repository."));
1476 string SVN::checkOut()
1478 TempFile tempfile("lyxvcout");
1479 FileName tmpf = tempfile.name();
1481 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1482 return N_("Error: Could not generate logfile.");
1485 doVCCommand("svn update --non-interactive " + quoteName(onlyFileName(owner_->absFileName()))
1486 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1487 FileName(owner_->filePath()));
1490 string const res = scanLogFile(tmpf, log);
1492 frontend::Alert::error(_("Revision control error."),
1493 bformat(_("Error when updating from repository.\n"
1494 "You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n"
1495 "After pressing OK, LyX will try to reopen the resolved document."),
1496 from_local8bit(res)));
1498 fileLock(true, tmpf, log);
1500 return log.empty() ? string() : "SVN: " + log;
1504 bool SVN::checkOutEnabled()
1513 string SVN::repoUpdate()
1515 TempFile tempfile("lyxvcout");
1516 FileName tmpf = tempfile.name();
1518 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1519 return N_("Error: Could not generate logfile.");
1522 doVCCommand("svn diff " + quoteName(owner_->filePath())
1523 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1524 FileName(owner_->filePath()));
1525 docstring res = tmpf.fileContents("UTF-8");
1527 LYXERR(Debug::LYXVC, "Diff detected:\n" << res);
1528 docstring const file = from_utf8(owner_->filePath());
1529 docstring text = bformat(_("There were detected changes "
1530 "in the working directory:\n%1$s\n\n"
1531 "In case of file conflict version of the local directory files "
1532 "will be preferred."
1533 "\n\nContinue?"), file);
1534 int ret = frontend::Alert::prompt(_("Changes detected"),
1535 text, 0, 1, _("&Yes"), _("&No"), _("View &Log ..."));
1537 dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
1538 ret = frontend::Alert::prompt(_("Changes detected"),
1539 text, 0, 1, _("&Yes"), _("&No"));
1540 hideDialogs("file", nullptr);
1546 // Reverting looks too harsh, see bug #6255.
1547 // doVCCommand("svn revert -R " + quoteName(owner_->filePath())
1548 // + " > " + quoteName(tmpf.toFilesystemEncoding()),
1549 // FileName(owner_->filePath()));
1550 // res = "Revert log:\n" + tmpf.fileContents("UTF-8");
1551 doVCCommand("svn update --accept mine-full " + quoteName(owner_->filePath())
1552 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1553 FileName(owner_->filePath()));
1554 res += "Update log:\n" + tmpf.fileContents("UTF-8");
1556 LYXERR(Debug::LYXVC, res);
1557 return to_utf8(res);
1561 bool SVN::repoUpdateEnabled()
1567 string SVN::lockingToggle()
1569 TempFile tempfile("lyxvcout");
1570 FileName tmpf = tempfile.name();
1572 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1573 return N_("Error: Could not generate logfile.");
1576 int ret = doVCCommand("svn proplist " + quoteName(onlyFileName(owner_->absFileName()))
1577 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1578 FileName(owner_->filePath()));
1583 string res = scanLogFile(tmpf, log);
1584 bool locking = contains(res, "svn:needs-lock");
1586 ret = doVCCommand("svn propset svn:needs-lock ON "
1587 + quoteName(onlyFileName(owner_->absFileName()))
1588 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1589 FileName(owner_->filePath()));
1591 ret = doVCCommand("svn propdel svn:needs-lock "
1592 + quoteName(onlyFileName(owner_->absFileName()))
1593 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1594 FileName(owner_->filePath()));
1598 frontend::Alert::warning(_("SVN File Locking"),
1599 (locking ? _("Locking property unset.") : _("Locking property set.")) + '\n'
1600 + _("Do not forget to commit the locking property into the repository."),
1603 return string("SVN: ") + (locking ?
1604 N_("Locking property unset.") : N_("Locking property set."));
1608 bool SVN::lockingToggleEnabled()
1616 // Reverts to the version in SVN repository and
1617 // gets the updated version from the repository.
1618 string const fil = quoteName(onlyFileName(owner_->absFileName()));
1620 if (doVCCommand("svn revert -q " + fil,
1621 FileName(owner_->filePath())))
1623 owner_->markClean();
1628 bool SVN::isRevertWithConfirmation()
1630 //FIXME owner && diff
1635 void SVN::undoLast()
1637 // merge the current with the previous version
1638 // in a reverse patch kind of way, so that the
1639 // result is to revert the last changes.
1640 lyxerr << "Sorry, not implemented." << endl;
1644 bool SVN::undoLastEnabled()
1650 string SVN::revisionInfo(LyXVC::RevisionInfo const info)
1652 if (info == LyXVC::Tree) {
1653 if (rev_tree_cache_.empty())
1654 if (!getTreeRevisionInfo())
1655 rev_tree_cache_ = "?";
1656 if (rev_tree_cache_ == "?")
1659 return rev_tree_cache_;
1662 // fill the rest of the attributes for a single file
1663 if (rev_file_cache_.empty())
1664 if (!getFileRevisionInfo())
1665 rev_file_cache_ = "?";
1669 if (rev_file_cache_ == "?")
1671 return rev_file_cache_;
1673 return rev_author_cache_;
1675 return rev_date_cache_;
1677 return rev_time_cache_;
1686 bool SVN::getFileRevisionInfo()
1688 TempFile tempfile("lyxvcout");
1689 FileName tmpf = tempfile.name();
1691 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1695 doVCCommand("svn info --xml " + quoteName(onlyFileName(owner_->absFileName()))
1696 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1697 FileName(owner_->filePath()));
1702 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1710 LYXERR(Debug::LYXVC, line);
1711 if (prefixIs(line, "<commit"))
1713 if (c && prefixIs(line, " revision=\"") && suffixIs(line, "\">")) {
1714 string l1 = subst(line, "revision=\"", "");
1715 string l2 = trim(subst(l1, "\">", ""));
1717 rev_file_cache_ = rev = l2;
1719 if (c && prefixIs(line, "<author>") && suffixIs(line, "</author>")) {
1720 string l1 = subst(line, "<author>", "");
1721 string l2 = subst(l1, "</author>", "");
1722 rev_author_cache_ = l2;
1724 if (c && prefixIs(line, "<date>") && suffixIs(line, "</date>")) {
1725 string l1 = subst(line, "<date>", "");
1726 string l2 = subst(l1, "</date>", "");
1727 l2 = split(l2, l1, 'T');
1728 rev_date_cache_ = l1;
1729 l2 = split(l2, l1, '.');
1730 rev_time_cache_ = l1;
1735 return !rev.empty();
1739 bool SVN::getTreeRevisionInfo()
1741 TempFile tempfile("lyxvcout");
1742 FileName tmpf = tempfile.name();
1744 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1748 doVCCommand("svnversion -n . > " + quoteName(tmpf.toFilesystemEncoding()),
1749 FileName(owner_->filePath()));
1754 // only first line in case something bad happens.
1755 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1760 rev_tree_cache_ = line;
1761 return !line.empty();
1765 void SVN::getLog(FileName const & tmpf)
1767 doVCCommand("svn log " + quoteName(onlyFileName(owner_->absFileName()))
1768 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1769 FileName(owner_->filePath()));
1773 bool SVN::prepareFileRevision(string const & revis, string & f)
1775 if (!isStrInt(revis))
1778 int rev = convert<int>(revis);
1780 if (!getFileRevisionInfo())
1783 rev = convert<int>(rev_file_cache_);
1784 // go back for minus rev
1786 rev = rev + convert<int>(rev_file_cache_);
1791 string revname = convert<string>(rev);
1792 TempFile tempfile("lyxvcrev_" + revname + '_');
1793 tempfile.setAutoRemove(false);
1794 FileName tmpf = tempfile.name();
1796 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1800 doVCCommand("svn cat -r " + revname + ' '
1801 + quoteName(onlyFileName(owner_->absFileName()))
1802 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1803 FileName(owner_->filePath()));
1805 if (tmpf.isFileEmpty())
1808 f = tmpf.absFileName();
1813 bool SVN::prepareFileRevisionEnabled()
1820 bool SVN::toggleReadOnlyEnabled()
1826 /////////////////////////////////////////////////////////////////////
1830 /////////////////////////////////////////////////////////////////////
1832 GIT::GIT(FileName const & m, Buffer * b) : VCS(b)
1834 // Here we know that the buffer file is either already in GIT or
1835 // about to be registered
1841 FileName const GIT::findFile(FileName const & file)
1843 // First we check the existence of repository meta data.
1844 if (!VCS::checkParentDirs(file, ".git")) {
1845 LYXERR(Debug::LYXVC, "Cannot find GIT meta data for " << file);
1849 // Now we check the status of the file.
1850 TempFile tempfile("lyxvcout");
1851 FileName tmpf = tempfile.name();
1853 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1857 string const fname = onlyFileName(file.absFileName());
1858 LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under git control for `"
1860 doVCCommandCall("git ls-files " +
1861 quoteName(fname) + " > " +
1862 quoteName(tmpf.toFilesystemEncoding()),
1865 bool found = !tmpf.isFileEmpty();
1866 LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" : "disabled"));
1867 return found ? file : FileName();
1871 void GIT::scanMaster()
1873 // vcstatus code is somewhat superflous,
1874 // until we want to implement read-only toggle for git.
1875 vcstatus = NOLOCKING;
1879 bool GIT::retrieve(FileName const & file)
1881 LYXERR(Debug::LYXVC, "LyXVC::GIT: retrieve.\n\t" << file);
1882 // The caller ensures that file does not exist, so no need to check that.
1883 return doVCCommandCall("git checkout -q " + quoteName(file.onlyFileName()),
1884 file.onlyPath()) == 0;
1888 void GIT::registrer(string const & /*msg*/)
1890 doVCCommand("git add " + quoteName(onlyFileName(owner_->absFileName())),
1891 FileName(owner_->filePath()));
1895 bool GIT::renameEnabled()
1901 string GIT::rename(support::FileName const & newFile, string const & msg)
1903 // git mv does not require a log message, since it does not commit.
1904 // In LyX we commit immediately afterwards, otherwise it could be
1905 // confusing to the user to have two uncommitted files.
1906 FileName path(owner_->filePath());
1907 string relFile(to_utf8(newFile.relPath(path.absFileName())));
1908 string cmd("git mv " + quoteName(onlyFileName(owner_->absFileName())) +
1909 ' ' + quoteName(relFile));
1910 if (doVCCommand(cmd, path)) {
1911 cmd = "git checkout -q " +
1912 quoteName(onlyFileName(owner_->absFileName())) + ' ' +
1914 doVCCommand(cmd, path);
1915 if (newFile.exists())
1916 newFile.removeFile();
1919 vector<support::FileName> f;
1920 f.push_back(owner_->fileName());
1921 f.push_back(newFile);
1923 if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
1924 cmd = "git checkout -q " +
1925 quoteName(onlyFileName(owner_->absFileName())) + ' ' +
1927 doVCCommand(cmd, path);
1928 if (newFile.exists())
1929 newFile.removeFile();
1936 bool GIT::copyEnabled()
1942 string GIT::copy(support::FileName const & /*newFile*/, string const & /*msg*/)
1944 // git does not support copy with history preservation
1949 LyXVC::CommandResult GIT::checkIn(string const & msg, string & log)
1951 vector<support::FileName> f(1, owner_->fileName());
1952 return checkIn(f, msg, log);
1956 LyXVC::CommandResult
1957 GIT::checkIn(vector<support::FileName> const & f, string const & msg, string & log)
1959 TempFile tempfile("lyxvcout");
1960 FileName tmpf = tempfile.name();
1962 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1963 log = N_("Error: Could not generate logfile.");
1964 return LyXVC::ErrorBefore;
1968 os << "git commit -m \"" << msg << '"';
1969 for (size_t i = 0; i < f.size(); ++i)
1970 os << ' ' << quoteName(f[i].onlyFileName());
1971 os << " > " << quoteName(tmpf.toFilesystemEncoding());
1972 LyXVC::CommandResult ret =
1973 doVCCommand(os.str(), FileName(owner_->filePath())) ?
1974 LyXVC::ErrorCommand : LyXVC::VCSuccess;
1976 string res = scanLogFile(tmpf, log);
1978 frontend::Alert::error(_("Revision control error."),
1979 _("Error when committing to repository.\n"
1980 "You have to manually resolve the problem.\n"
1981 "LyX will reopen the document after you press OK."));
1982 ret = LyXVC::ErrorCommand;
1986 log.insert(0, "GIT: ");
1987 if (ret == LyXVC::VCSuccess && log.empty())
1988 log = "GIT: Proceeded";
1993 bool GIT::checkInEnabled()
1999 bool GIT::isCheckInWithConfirmation()
2001 // FIXME one day common getDiff and perhaps OpMode for all backends
2003 TempFile tempfile("lyxvcout");
2004 FileName tmpf = tempfile.name();
2006 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
2010 doVCCommandCall("git diff " + quoteName(owner_->absFileName())
2011 + " > " + quoteName(tmpf.toFilesystemEncoding()),
2012 FileName(owner_->filePath()));
2014 docstring diff = tmpf.fileContents("UTF-8");
2023 // FIXME Correctly return code should be checked instead of this.
2024 // This would need another solution than just plain startscript.
2025 // Hint from Andre': QProcess::readAllStandardError()...
2026 string GIT::scanLogFile(FileName const & f, string & status)
2028 ifstream ifs(f.toFilesystemEncoding().c_str());
2033 LYXERR(Debug::LYXVC, line << "\n");
2035 status += line + "; ";
2036 if (prefixIs(line, "C ") || prefixIs(line, "CU ")
2037 || contains(line, "Commit failed")) {
2047 string GIT::checkOut()
2053 bool GIT::checkOutEnabled()
2059 string GIT::repoUpdate()
2065 bool GIT::repoUpdateEnabled()
2071 string GIT::lockingToggle()
2077 bool GIT::lockingToggleEnabled()
2085 // Reverts to the version in GIT repository and
2086 // gets the updated version from the repository.
2087 string const fil = quoteName(onlyFileName(owner_->absFileName()));
2089 if (doVCCommand("git checkout -q " + fil,
2090 FileName(owner_->filePath())))
2092 owner_->markClean();
2097 bool GIT::isRevertWithConfirmation()
2099 //FIXME owner && diff
2104 void GIT::undoLast()
2106 // merge the current with the previous version
2107 // in a reverse patch kind of way, so that the
2108 // result is to revert the last changes.
2109 lyxerr << "Sorry, not implemented." << endl;
2113 bool GIT::undoLastEnabled()
2119 string GIT::revisionInfo(LyXVC::RevisionInfo const info)
2121 if (info == LyXVC::Tree) {
2122 if (rev_tree_cache_.empty())
2123 if (!getTreeRevisionInfo())
2124 rev_tree_cache_ = "?";
2125 if (rev_tree_cache_ == "?")
2128 return rev_tree_cache_;
2131 // fill the rest of the attributes for a single file
2132 if (rev_file_cache_.empty())
2133 if (!getFileRevisionInfo()) {
2134 rev_file_cache_ = "?";
2135 rev_file_abbrev_cache_ = "?";
2140 if (rev_file_cache_ == "?")
2142 return rev_file_cache_;
2143 case LyXVC::FileAbbrev:
2144 if (rev_file_abbrev_cache_ == "?")
2146 return rev_file_abbrev_cache_;
2148 return rev_author_cache_;
2150 return rev_date_cache_;
2152 return rev_time_cache_;
2161 bool GIT::getFileRevisionInfo()
2163 TempFile tempfile("lyxvcout");
2164 FileName tmpf = tempfile.name();
2166 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
2170 doVCCommand("git log -n 1 --pretty=format:%H%n%h%n%an%n%ai " + quoteName(onlyFileName(owner_->absFileName()))
2171 + " > " + quoteName(tmpf.toFilesystemEncoding()),
2172 FileName(owner_->filePath()));
2177 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
2180 getline(ifs, rev_file_cache_);
2182 getline(ifs, rev_file_abbrev_cache_);
2184 getline(ifs, rev_author_cache_);
2188 rev_time_cache_ = split(line, rev_date_cache_, ' ');
2192 return !rev_file_cache_.empty();
2196 bool GIT::getTreeRevisionInfo()
2198 TempFile tempfile("lyxvcout");
2199 FileName tmpf = tempfile.name();
2201 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
2205 doVCCommand("git describe --abbrev --dirty --long > " + quoteName(tmpf.toFilesystemEncoding()),
2206 FileName(owner_->filePath()),
2207 false); //git describe returns $?=128 when no tag found (but git repo still exists)
2212 // only first line in case something bad happens.
2213 ifstream ifs(tmpf.toFilesystemEncoding().c_str());
2214 getline(ifs, rev_tree_cache_);
2217 return !rev_tree_cache_.empty();
2221 void GIT::getLog(FileName const & tmpf)
2223 doVCCommand("git log " + quoteName(onlyFileName(owner_->absFileName()))
2224 + " > " + quoteName(tmpf.toFilesystemEncoding()),
2225 FileName(owner_->filePath()));
2229 //at this moment we don't accept revision SHA, but just number of revision steps back
2230 //GUI and infrastucture needs to be changed first
2231 bool GIT::prepareFileRevision(string const & revis, string & f)
2233 // anything positive means we got hash, not "0" or minus revision
2236 // hash is rarely number and should be long
2237 if (isStrInt(revis) && revis.length()<20)
2238 rev = convert<int>(revis);
2240 // revision and filename
2243 // go back for "minus" revisions
2245 pointer = "HEAD~" + convert<string>(-rev);
2252 TempFile tempfile("lyxvcrev_" + revis + '_');
2253 tempfile.setAutoRemove(false);
2254 FileName tmpf = tempfile.name();
2256 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
2260 doVCCommand("git show " + pointer + "./"
2261 + quoteName(onlyFileName(owner_->absFileName()))
2262 + " > " + quoteName(tmpf.toFilesystemEncoding()),
2263 FileName(owner_->filePath()));
2265 if (tmpf.isFileEmpty())
2268 f = tmpf.absFileName();
2273 bool GIT::prepareFileRevisionEnabled()
2279 bool GIT::toggleReadOnlyEnabled()