]> git.lyx.org Git - lyx.git/blob - src/VCBackend.cpp
Avoid full metrics computation with Update:FitCursor
[lyx.git] / src / VCBackend.cpp
1 /**
2  * \file VCBackend.cpp
3  * This file is part of LyX, the document processor.
4  * Licence details can be found in the file COPYING.
5  *
6  * \author Lars Gullik Bjønnes
7  * \author Pavel Sanda
8  *
9  * Full author contact details are available in file CREDITS.
10  */
11
12 #include <config.h>
13
14 #include "VCBackend.h"
15 #include "Buffer.h"
16 #include "LyX.h"
17 #include "FuncRequest.h"
18
19 #include "frontends/alert.h"
20 #include "frontends/Application.h"
21
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"
30
31 #include <fstream>
32 #include <iomanip>
33 #include <regex>
34 #include <sstream>
35
36 using namespace std;
37 using namespace lyx::support;
38
39
40 namespace lyx {
41
42
43 int VCS::doVCCommandCall(string const & cmd, FileName const & path)
44 {
45         LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd);
46         Systemcall one;
47         support::PathChanger p(path);
48         return one.startscript(Systemcall::Wait, cmd, string(), string(), false);
49 }
50
51
52 int VCS::doVCCommand(string const & cmd, FileName const & path, bool reportError)
53 {
54         if (owner_)
55                 owner_->setBusy(true);
56
57         int const ret = doVCCommandCall(cmd, path);
58
59         if (owner_)
60                 owner_->setBusy(false);
61         if (ret && reportError) {
62                 docstring rcsmsg;
63                 if (prefixIs(cmd, "ci "))
64                         rcsmsg = "\n" + _("Check whether the GNU RCS package is installed on your system.");
65                 frontend::Alert::error(_("Revision control error."),
66                         bformat(_("Some problem occurred while running the command:\n"
67                                   "'%1$s'.") + rcsmsg,
68                         from_utf8(cmd)));
69         }
70         return ret;
71 }
72
73
74 bool VCS::makeRCSRevision(string const &version, string &revis) const
75 {
76         string rev = revis;
77
78         if (isStrInt(rev)) {
79                 int back = convert<int>(rev);
80                 // if positive use as the last number in the whole revision string
81                 if (back > 0) {
82                         string base;
83                         rsplit(version, base , '.');
84                         rev = base + '.' + rev;
85                 }
86                 if (back == 0)
87                         rev = version;
88                 // we care about the last number from revision string
89                 // in case of backward indexing
90                 if (back < 0) {
91                         string cur, base;
92                         cur = rsplit(version, base , '.');
93                         if (!isStrInt(cur))
94                                 return false;
95                         int want = convert<int>(cur) + back;
96                         if (want <= 0)
97                                 return false;
98
99                         rev = base + '.' + convert<string>(want);
100                 }
101         }
102
103         revis = rev;
104         return true;
105 }
106
107
108 FileName VCS::checkParentDirs(FileName const & start, std::string const & file)
109 {
110         FileName dirname = start.onlyPath();
111         do {
112                 FileName tocheck = FileName(addPathName(dirname.absFileName(), file));
113                 LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName());
114                 if (tocheck.exists())
115                         return tocheck;
116                 // this construct because of #8295
117                 dirname = FileName(dirname.absFileName()).parentPath();
118         } while (!dirname.empty());
119         return FileName();
120 }
121
122
123 /////////////////////////////////////////////////////////////////////
124 //
125 // RCS
126 //
127 /////////////////////////////////////////////////////////////////////
128
129 RCS::RCS(FileName const & m, Buffer * b) : VCS(b)
130 {
131         // Here we know that the buffer file is either already in RCS or
132         // about to be registered
133         master_ = m;
134         scanMaster();
135 }
136
137
138 FileName const RCS::findFile(FileName const & file)
139 {
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.");
145                 return tmp;
146         }
147
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.");
153                 return tmp;
154         }
155
156         return FileName();
157 }
158
159
160 bool RCS::retrieve(FileName const & file)
161 {
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         int const ret = doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()));
165         return ret == 0;
166 }
167
168
169 void RCS::scanMaster()
170 {
171         if (master_.empty())
172                 return;
173
174         LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster: " << master_);
175
176         ifstream ifs(master_.toFilesystemEncoding().c_str());
177         // limit the size of strings we read to avoid memory problems
178         ifs >> setw(65636);
179
180         string token;
181         bool read_enough = false;
182
183         while (!read_enough && ifs >> token) {
184                 LYXERR(Debug::LYXVC, "LyXVC::scanMaster: current lex text: `"
185                         << token << '\'');
186
187                 if (token.empty())
188                         continue;
189                 else if (token == "head") {
190                         // get version here
191                         string tmv;
192                         ifs >> tmv;
193                         tmv = rtrim(tmv, ";");
194                         version_ = 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")) {
199                         // nothing
200                 } else if (contains(token, "locks")) {
201                         // get locker here
202                         if (contains(token, ';')) {
203                                 locker_ = "Unlocked";
204                                 vcstatus_ = UNLOCKED;
205                                 continue;
206                         }
207                         string tmpt;
208                         string s1;
209                         string s2;
210                         do {
211                                 ifs >> tmpt;
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_) {
217                                         locker_ = s2;
218                                         vcstatus_ = LOCKED;
219                                         break;
220                                 }
221                         } while (!contains(tmpt, ';'));
222
223                 } else if (token == "comment") {
224                         // we don't need to read any further than this.
225                         read_enough = true;
226                 } else {
227                         // unexpected
228                         LYXERR(Debug::LYXVC, "LyXVC::scanMaster(): unexpected token");
229                 }
230         }
231 }
232
233
234 void RCS::registrer(string const & msg)
235 {
236         string cmd = "ci -q -u -i -t-\"";
237         cmd += msg;
238         cmd += "\" ";
239         cmd += quoteName(onlyFileName(owner_->absFileName()));
240         doVCCommand(cmd, FileName(owner_->filePath()));
241 }
242
243
244 bool RCS::renameEnabled()
245 {
246         return false;
247 }
248
249
250 string RCS::rename(support::FileName const & /*newFile*/, string const & /*msg*/)
251 {
252         // not implemented, since a left-over file.lyx,v would be confusing.
253         return string();
254 }
255
256
257 bool RCS::copyEnabled()
258 {
259         return true;
260 }
261
262
263 string RCS::copy(support::FileName const & newFile, string const & msg)
264 {
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))
268                 return string();
269         FileName path(oldFile.onlyPath());
270         string relFile(to_utf8(newFile.relPath(path.absFileName())));
271         string cmd = "ci -q -u -i -t-\"";
272         cmd += msg;
273         cmd += "\" ";
274         cmd += quoteName(relFile);
275         return doVCCommand(cmd, path) ? string() : "RCS: Proceeded";
276 }
277
278
279 LyXVC::CommandResult RCS::checkIn(string const & msg, string & log)
280 {
281         int ret = doVCCommand("ci -q -u -m\"" + msg + "\" "
282                     + quoteName(onlyFileName(owner_->absFileName())),
283                     FileName(owner_->filePath()));
284         if (ret)
285                 return LyXVC::ErrorCommand;
286         log = "RCS: Proceeded";
287         return LyXVC::VCSuccess;
288 }
289
290
291 bool RCS::checkInEnabled()
292 {
293         return owner_ && !owner_->hasReadonlyFlag();
294 }
295
296
297 bool RCS::isCheckInWithConfirmation()
298 {
299         // FIXME one day common getDiff for all backends
300         // docstring diff;
301         // if (getDiff(file, diff) && diff.empty())
302         //      return false;
303
304         TempFile tempfile("lyxvcout");
305         FileName tmpf = tempfile.name();
306         if (tmpf.empty()) {
307                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
308                 return true;
309         }
310
311         doVCCommandCall("rcsdiff " + quoteName(owner_->absFileName())
312                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
313                 FileName(owner_->filePath()));
314
315         docstring diff = tmpf.fileContents("UTF-8");
316
317         if (diff.empty())
318                 return false;
319
320         return true;
321 }
322
323
324 string RCS::checkOut()
325 {
326         owner_->markClean();
327         int ret = doVCCommand("co -q -l " + quoteName(onlyFileName(owner_->absFileName())),
328                     FileName(owner_->filePath()));
329         return ret ? string() : "RCS: Proceeded";
330 }
331
332
333 bool RCS::checkOutEnabled()
334 {
335         return owner_ && owner_->hasReadonlyFlag();
336 }
337
338
339 string RCS::repoUpdate()
340 {
341         lyxerr << "Sorry, not implemented." << endl;
342         return string();
343 }
344
345
346 bool RCS::repoUpdateEnabled()
347 {
348         return false;
349 }
350
351
352 string RCS::lockingToggle()
353 {
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;
358         return string();
359 }
360
361
362 bool RCS::lockingToggleEnabled()
363 {
364         return false;
365 }
366
367
368 bool RCS::revert()
369 {
370         if (doVCCommand("co -f -u" + version_ + ' '
371                     + quoteName(onlyFileName(owner_->absFileName())),
372                     FileName(owner_->filePath())))
373                 return false;
374         // We ignore changes and just reload!
375         owner_->markClean();
376         return true;
377 }
378
379
380 bool RCS::isRevertWithConfirmation()
381 {
382         //FIXME owner && diff ?
383         return true;
384 }
385
386
387 void RCS::undoLast()
388 {
389         LYXERR(Debug::LYXVC, "LyXVC: undoLast");
390         doVCCommand("rcs -o" + version_ + ' '
391                     + quoteName(onlyFileName(owner_->absFileName())),
392                     FileName(owner_->filePath()));
393 }
394
395
396 bool RCS::undoLastEnabled()
397 {
398         return owner_->hasReadonlyFlag();
399 }
400
401
402 void RCS::getLog(FileName const & tmpf)
403 {
404         doVCCommand("rlog " + quoteName(onlyFileName(owner_->absFileName()))
405                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
406                     FileName(owner_->filePath()));
407 }
408
409
410 bool RCS::toggleReadOnlyEnabled()
411 {
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.
415         // return true;
416         return false;
417 }
418
419
420 string RCS::revisionInfo(LyXVC::RevisionInfo const info)
421 {
422         if (info == LyXVC::File)
423                 return version_;
424         // fill the rest of the attributes for a single file
425         if (rev_date_cache_.empty())
426                 if (!getRevisionInfo())
427                         return string();
428
429         switch (info) {
430                 case LyXVC::Author:
431                         return rev_author_cache_;
432                 case LyXVC::Date:
433                         return rev_date_cache_;
434                 case LyXVC::Time:
435                         return rev_time_cache_;
436                 default:
437                         break;
438         }
439
440         return string();
441 }
442
443
444 bool RCS::getRevisionInfo()
445 {
446         TempFile tempfile("lyxvcout");
447         FileName tmpf = tempfile.name();
448         if (tmpf.empty()) {
449                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
450                 return false;
451         }
452         doVCCommand("rlog -r " + quoteName(onlyFileName(owner_->absFileName()))
453                 + " > " + quoteName(tmpf.toFilesystemEncoding()),
454                 FileName(owner_->filePath()));
455
456         if (tmpf.empty())
457                 return false;
458
459         ifstream ifs(tmpf.toFilesystemEncoding().c_str());
460         string line;
461
462         // we reached to the entry, i.e. after initial log message
463         bool entry=false;
464         // line with critical info, e.g:
465         //"date: 2011/07/02 11:02:54;  author: sanda;  state: Exp;  lines: +17 -2"
466         string result;
467
468         while (ifs) {
469                 getline(ifs, line);
470                 LYXERR(Debug::LYXVC, line);
471                 if (entry && prefixIs(line, "date:")) {
472                         result = line;
473                         break;
474                 }
475                 if (prefixIs(line, "revision"))
476                         entry = true;
477         }
478         if (result.empty())
479                 return false;
480
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));
484
485         return !rev_author_cache_.empty();
486 }
487
488 bool RCS::prepareFileRevision(string const &revis, string & f)
489 {
490         string rev = revis;
491         if (!VCS::makeRCSRevision(version_, rev))
492                 return false;
493
494         TempFile tempfile("lyxvcrev_" + rev + '_');
495         tempfile.setAutoRemove(false);
496         FileName tmpf = tempfile.name();
497         if (tmpf.empty()) {
498                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
499                 return false;
500         }
501
502         doVCCommand("co -p" + rev + ' '
503                       + quoteName(onlyFileName(owner_->absFileName()))
504                       + " > " + quoteName(tmpf.toFilesystemEncoding()),
505                 FileName(owner_->filePath()));
506         tmpf.refresh();
507         if (tmpf.isFileEmpty())
508                 return false;
509
510         f = tmpf.absFileName();
511         return true;
512 }
513
514
515 bool RCS::prepareFileRevisionEnabled()
516 {
517         return true;
518 }
519
520
521 /////////////////////////////////////////////////////////////////////
522 //
523 // CVS
524 //
525 /////////////////////////////////////////////////////////////////////
526
527 CVS::CVS(FileName const & m, Buffer * b) : VCS(b)
528 {
529         // Here we know that the buffer file is either already in CVS or
530         // about to be registered
531         master_ = m;
532         have_rev_info_ = false;
533         scanMaster();
534 }
535
536
537 FileName const CVS::findFile(FileName const & file)
538 {
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
550                 // dirty parse here.
551                 ifstream ifs(entries.toFilesystemEncoding().c_str());
552                 string line;
553                 while (getline(ifs, line)) {
554                         LYXERR(Debug::LYXVC, "\tEntries: " << line);
555                         if (contains(line, tmpf))
556                                 return entries;
557                 }
558         }
559         return FileName();
560 }
561
562
563 void CVS::scanMaster()
564 {
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 const name = onlyFileName(owner_->absFileName());
569         string const tmpf = '/' + name + '/';
570         LYXERR(Debug::LYXVC, "\tlooking for `" << tmpf << '\'');
571         string line;
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.
577                         smatch sm;
578                         if (!regex_match(line, sm, reg)) {
579                                 LYXERR(Debug::LYXVC, "\t  Cannot parse line. Skipping.");
580                                 continue;
581                         }
582
583                         //sm[0]; // whole matched string
584                         //sm[1]; // filename
585                         version_ = sm.str(2);
586                         string const file_date = sm.str(3);
587
588                         //sm[4]; // options
589                         //sm[5]; // tag or tagdate
590                         FileName file(owner_->absFileName());
591                         if (file.isReadableFile()) {
592                                 time_t const mod = file.lastModified();
593                                 string const 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
598                                         vcstatus_ = UNLOCKED;
599                                 } else {
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;
604                                 }
605                         } else {
606                                 vcstatus_ = NOLOCKING;
607                         }
608                         break;
609                 }
610         }
611 }
612
613
614 bool CVS::retrieve(FileName const & file)
615 {
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;
620 }
621
622
623 string const CVS::getTarget(OperationMode opmode) const
624 {
625         switch(opmode) {
626         case Directory:
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
629                 return ".";
630         case File:
631                 return quoteName(onlyFileName(owner_->absFileName()));
632         }
633         return string();
634 }
635
636
637 docstring CVS::toString(CvsStatus status) const
638 {
639         switch (status) {
640         case UpToDate:
641                 return _("Up-to-date");
642         case LocallyModified:
643                 return _("Locally Modified");
644         case LocallyAdded:
645                 return _("Locally Added");
646         case NeedsMerge:
647                 return _("Needs Merge");
648         case NeedsCheckout:
649                 return _("Needs Checkout");
650         case NoCvsFile:
651                 return _("No CVS file");
652         case StatusError:
653                 return _("Cannot retrieve CVS status");
654         }
655         return docstring();
656 }
657
658
659 int CVS::doVCCommandWithOutput(string const & cmd, FileName const & path,
660         FileName const & output, bool reportError)
661 {
662         string redirection = output.empty() ? "" : " > " + quoteName(output.toFilesystemEncoding());
663         return doVCCommand(cmd + redirection, path, reportError);
664 }
665
666
667 int CVS::doVCCommandCallWithOutput(std::string const & cmd,
668         support::FileName const & path,
669         support::FileName const & output)
670 {
671         string redirection = output.empty() ? "" : " > " + quoteName(output.toFilesystemEncoding());
672         return doVCCommandCall(cmd + redirection, path);
673 }
674
675
676 CVS::CvsStatus CVS::getStatus()
677 {
678         TempFile tempfile("lyxvout");
679         FileName tmpf = tempfile.name();
680         if (tmpf.empty()) {
681                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
682                 return StatusError;
683         }
684
685         if (doVCCommandCallWithOutput("cvs status " + getTarget(File),
686                 FileName(owner_->filePath()), tmpf)) {
687                 return StatusError;
688         }
689
690         ifstream ifs(tmpf.toFilesystemEncoding().c_str());
691         CvsStatus status = NoCvsFile;
692
693         while (ifs) {
694                 string line;
695                 getline(ifs, line);
696                 LYXERR(Debug::LYXVC, line << '\n');
697                 if (prefixIs(line, "File:")) {
698                         if (contains(line, "Up-to-date"))
699                                 status = UpToDate;
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"))
705                                 status = NeedsMerge;
706                         else if (contains(line, "Needs Checkout"))
707                                 status = NeedsCheckout;
708                 }
709         }
710         return status;
711 }
712
713 void CVS::getRevisionInfo()
714 {
715         if (have_rev_info_)
716                 return;
717         have_rev_info_ = true;
718         TempFile tempfile("lyxvout");
719         FileName tmpf = tempfile.name();
720         if (tmpf.empty()) {
721                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
722                 return;
723         }
724
725         int rc = doVCCommandCallWithOutput("cvs log -r" + version_
726                 + ' ' + getTarget(File),
727                 FileName(owner_->filePath()), tmpf);
728         if (rc) {
729                 LYXERR(Debug::LYXVC, "cvs log failed with exit code " << rc);
730                 return;
731         }
732
733         ifstream ifs(tmpf.toFilesystemEncoding().c_str());
734         static regex const reg("date: (.*) (.*) (.*);  author: (.*);  state: (.*);(.*)");
735
736         while (ifs) {
737                 string line;
738                 getline(ifs, line);
739                 LYXERR(Debug::LYXVC, line << '\n');
740                 if (prefixIs(line, "date:")) {
741                         smatch sm;
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];
748                         } else
749                           LYXERR(Debug::LYXVC, "\tCannot parse line. Skipping."); 
750                         break;
751                 }
752         }
753         if (rev_author_cache_.empty())
754                 LYXERR(Debug::LYXVC,
755                    "Could not retrieve revision info for " << version_ <<
756                    " of " << getTarget(File));
757 }
758
759
760 void CVS::registrer(string const & msg)
761 {
762         doVCCommand("cvs -q add -m \"" + msg + "\" "
763                 + getTarget(File),
764                 FileName(owner_->filePath()));
765 }
766
767
768 bool CVS::renameEnabled()
769 {
770         return true;
771 }
772
773
774 string CVS::rename(support::FileName const & newFile, string const & msg)
775 {
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);
779         if (ret.empty())
780                 return ret;
781         string cmd = "cvs -q remove -m \"" + msg + "\" " +
782                 quoteName(oldFile.onlyFileName());
783         FileName path(oldFile.onlyPath());
784         return doVCCommand(cmd, path) ? string() : ret;
785 }
786
787
788 bool CVS::copyEnabled()
789 {
790         return true;
791 }
792
793
794 string CVS::copy(support::FileName const & newFile, string const & msg)
795 {
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))
799                 return string();
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";
804 }
805
806
807 void CVS::getDiff(OperationMode opmode, FileName const & tmpf)
808 {
809         doVCCommandWithOutput("cvs diff " + getTarget(opmode),
810                 FileName(owner_->filePath()), tmpf, false);
811 }
812
813
814 int CVS::edit()
815 {
816         vcstatus_ = LOCKED;
817         return doVCCommand("cvs -q edit " + getTarget(File),
818                 FileName(owner_->filePath()));
819 }
820
821
822 int CVS::unedit()
823 {
824         vcstatus_ = UNLOCKED;
825         return doVCCommand("cvs -q unedit " + getTarget(File),
826                 FileName(owner_->filePath()));
827 }
828
829
830 int CVS::update(OperationMode opmode, FileName const & tmpf)
831 {
832         return doVCCommandWithOutput("cvs -q update "
833                 + getTarget(opmode),
834                 FileName(owner_->filePath()), tmpf, false);
835 }
836
837
838 string CVS::scanLogFile(FileName const & f, string & status)
839 {
840         ifstream ifs(f.toFilesystemEncoding().c_str());
841
842         while (ifs) {
843                 string line;
844                 getline(ifs, line);
845                 LYXERR(Debug::LYXVC, line << '\n');
846                 if (!line.empty())
847                         status += line + "; ";
848                 if (prefixIs(line, "C ")) {
849                         ifs.close();
850                         return line;
851                 }
852         }
853         ifs.close();
854         return string();
855 }
856
857
858 LyXVC::CommandResult CVS::checkIn(string const & msg, string & log)
859 {
860         CvsStatus status = getStatus();
861         switch (status) {
862         case UpToDate:
863                 if (vcstatus_ != NOLOCKING)
864                         if (unedit())
865                                 return LyXVC::ErrorCommand;
866                 log = "CVS: Proceeded";
867                 return LyXVC::VCSuccess;
868         case LocallyModified:
869         case LocallyAdded: {
870                 int rc = doVCCommand("cvs -q commit -m \"" + msg + "\" "
871                         + getTarget(File),
872                     FileName(owner_->filePath()));
873                 if (rc)
874                         return LyXVC::ErrorCommand;
875                 log = "CVS: Proceeded";
876                 return LyXVC::VCSuccess;
877         }
878         case NeedsMerge:
879         case NeedsCheckout:
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.")) ;
883                 break;
884         default:
885                 frontend::Alert::error(_("Revision control error."),
886                         bformat(_("Bad status when checking in changes.\n"
887                                           "\n'%1$s'\n\n"),
888                                 toString(status)));
889                 break;
890         }
891         return LyXVC::ErrorBefore;
892 }
893
894
895 bool CVS::isLocked() const
896 {
897         FileName fn(owner_->absFileName());
898         fn.refresh();
899         return !fn.isReadOnly();
900 }
901
902
903 bool CVS::checkInEnabled()
904 {
905         if (vcstatus_ != NOLOCKING)
906                 return isLocked();
907         else
908                 return true;
909 }
910
911
912 bool CVS::isCheckInWithConfirmation()
913 {
914         CvsStatus status = getStatus();
915         return status == LocallyModified || status == LocallyAdded;
916 }
917
918
919 string CVS::checkOut()
920 {
921         if (vcstatus_ != NOLOCKING && edit())
922                 return string();
923         TempFile tempfile("lyxvout");
924         FileName tmpf = tempfile.name();
925         if (tmpf.empty()) {
926                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
927                 return string();
928         }
929
930         int rc = update(File, tmpf);
931         string log;
932         string const res = scanLogFile(tmpf, log);
933         if (!res.empty()) {
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)));
939                 rc = 0;
940         }
941
942         return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
943 }
944
945
946 bool CVS::checkOutEnabled()
947 {
948         if (vcstatus_ != NOLOCKING)
949                 return !isLocked();
950         else
951                 return true;
952 }
953
954
955 string CVS::repoUpdate()
956 {
957         TempFile tempfile("lyxvout");
958         FileName tmpf = tempfile.name();
959         if (tmpf.empty()) {
960                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
961                 return string();
962         }
963
964         getDiff(Directory, tmpf);
965         docstring res = tmpf.fileContents("UTF-8");
966         if (!res.empty()) {
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 ..."));
975                 if (ret == 2) {
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);
980                 }
981                 if (ret == 1)
982                         return string();
983         }
984
985         int rc = update(Directory, tmpf);
986         res += "Update log:\n" + tmpf.fileContents("UTF-8");
987         LYXERR(Debug::LYXVC, res);
988
989         string log;
990         string sres = scanLogFile(tmpf, log);
991         if (!sres.empty()) {
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)));
998                 rc = 0;
999         }
1000
1001         return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
1002 }
1003
1004
1005 bool CVS::repoUpdateEnabled()
1006 {
1007         return true;
1008 }
1009
1010
1011 string CVS::lockingToggle()
1012 {
1013         lyxerr << "Sorry, not implemented." << endl;
1014         return string();
1015 }
1016
1017
1018 bool CVS::lockingToggleEnabled()
1019 {
1020         return false;
1021 }
1022
1023
1024 bool CVS::isRevertWithConfirmation()
1025 {
1026         CvsStatus status = getStatus();
1027         return !owner_->isClean() || status == LocallyModified || status == NeedsMerge;
1028 }
1029
1030
1031 bool CVS::revert()
1032 {
1033         // Reverts to the version in CVS repository and
1034         // gets the updated version from the repository.
1035         CvsStatus status = getStatus();
1036         switch (status) {
1037         case UpToDate:
1038                 if (vcstatus_ != NOLOCKING)
1039                         return 0 == unedit();
1040                 break;
1041         case NeedsMerge:
1042         case NeedsCheckout:
1043         case LocallyModified: {
1044                 FileName f(owner_->absFileName());
1045                 f.removeFile();
1046                 update(File, FileName());
1047                 owner_->markClean();
1048                 break;
1049         }
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."),
1055                                 file)) ;
1056                 return false;
1057         }
1058         default: {
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)));
1064                 return false;
1065                 }
1066         }
1067         return true;
1068 }
1069
1070
1071 void CVS::undoLast()
1072 {
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;
1077 }
1078
1079
1080 bool CVS::undoLastEnabled()
1081 {
1082         return false;
1083 }
1084
1085
1086 void CVS::getLog(FileName const & tmpf)
1087 {
1088         doVCCommandWithOutput("cvs log " + getTarget(File),
1089                 FileName(owner_->filePath()),
1090                 tmpf);
1091 }
1092
1093
1094 bool CVS::toggleReadOnlyEnabled()
1095 {
1096         return false;
1097 }
1098
1099
1100 string CVS::revisionInfo(LyXVC::RevisionInfo const info)
1101 {
1102         if (!version_.empty()) {
1103                 getRevisionInfo();
1104                 switch (info) {
1105                 case LyXVC::File:
1106                         return version_;
1107                 case LyXVC::Author:
1108                         return rev_author_cache_;
1109                 case LyXVC::Date:
1110                         return rev_date_cache_;
1111                 case LyXVC::Time:
1112                         return rev_time_cache_;
1113                 default:
1114                         break;
1115                 }
1116         }
1117         return string();
1118 }
1119
1120
1121 bool CVS::prepareFileRevision(string const & revis, string & f)
1122 {
1123         string rev = revis;
1124         if (!VCS::makeRCSRevision(version_, rev))
1125                 return false;
1126
1127         TempFile tempfile("lyxvcrev_" + rev + '_');
1128         tempfile.setAutoRemove(false);
1129         FileName tmpf = tempfile.name();
1130         if (tmpf.empty()) {
1131                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1132                 return false;
1133         }
1134
1135         doVCCommandWithOutput("cvs update -p -r" + rev + ' '
1136                 + getTarget(File),
1137                 FileName(owner_->filePath()), tmpf);
1138         tmpf.refresh();
1139         if (tmpf.isFileEmpty())
1140                 return false;
1141
1142         f = tmpf.absFileName();
1143         return true;
1144 }
1145
1146
1147 bool CVS::prepareFileRevisionEnabled()
1148 {
1149         return true;
1150 }
1151
1152
1153 /////////////////////////////////////////////////////////////////////
1154 //
1155 // SVN
1156 //
1157 /////////////////////////////////////////////////////////////////////
1158
1159 SVN::SVN(Buffer * b) : VCS(b)
1160 {
1161         // Here we know that the buffer file is either already in SVN or
1162         // about to be registered
1163         locked_mode_ = false;
1164         scanMaster();
1165 }
1166
1167
1168 bool SVN::findFile(FileName const & file)
1169 {
1170         // First we check the existence of repository meta data.
1171         if (VCS::checkParentDirs(file, ".svn").empty()) {
1172                 LYXERR(Debug::LYXVC, "Cannot find SVN meta data for " << file);
1173                 return false;
1174         }
1175
1176         // Now we check the status of the file.
1177         string const fname = onlyFileName(file.absFileName());
1178         LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under svn control for `" << fname << '\'');
1179         bool found = 0 == doVCCommandCall("svn info " + quoteName(fname),
1180                                                 file.onlyPath());
1181         LYXERR(Debug::LYXVC, "SVN control: " << (found ? "enabled" : "disabled"));
1182         return found;
1183 }
1184
1185
1186 void SVN::scanMaster()
1187 {
1188         // vcstatus code is somewhat superflous,
1189         // until we want to implement read-only toggle for svn.
1190         vcstatus_ = NOLOCKING;
1191         if (checkLockMode())
1192                 vcstatus_ = isLocked() ? LOCKED : UNLOCKED;
1193 }
1194
1195
1196 bool SVN::checkLockMode()
1197 {
1198         TempFile tempfile("lyxvcout");
1199         FileName tmpf = tempfile.name();
1200         if (tmpf.empty()){
1201                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1202                 return false;
1203         }
1204
1205         LYXERR(Debug::LYXVC, "Detecting locking mode...");
1206         if (doVCCommandCall("svn proplist " + quoteName(onlyFileName(owner_->absFileName()))
1207                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1208                     FileName(owner_->filePath())))
1209                 return false;
1210
1211         ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1212         string line;
1213         bool ret = false;
1214
1215         while (ifs && !ret) {
1216                 getline(ifs, line);
1217                 LYXERR(Debug::LYXVC, line);
1218                 if (contains(line, "svn:needs-lock"))
1219                         ret = true;
1220         }
1221         LYXERR(Debug::LYXVC, "Locking enabled: " << ret);
1222         ifs.close();
1223         locked_mode_ = ret;
1224         return ret;
1225
1226 }
1227
1228
1229 bool SVN::isLocked() const
1230 {
1231         FileName file(owner_->absFileName());
1232         file.refresh();
1233         return !file.isReadOnly();
1234 }
1235
1236
1237 bool SVN::retrieve(FileName const & file)
1238 {
1239         LYXERR(Debug::LYXVC, "LyXVC::SVN: retrieve.\n\t" << file);
1240         // The caller ensures that file does not exist, so no need to check that.
1241         return doVCCommandCall("svn update -q --non-interactive " + quoteName(file.onlyFileName()),
1242                                file.onlyPath()) == 0;
1243 }
1244
1245
1246 void SVN::registrer(string const & /*msg*/)
1247 {
1248         doVCCommand("svn add -q --parents " + quoteName(onlyFileName(owner_->absFileName())),
1249                     FileName(owner_->filePath()));
1250 }
1251
1252
1253 bool SVN::renameEnabled()
1254 {
1255         return true;
1256 }
1257
1258
1259 string SVN::rename(support::FileName const & newFile, string const & msg)
1260 {
1261         // svn move does not require a log message, since it does not commit.
1262         // In LyX we commit immediately afterwards, otherwise it could be
1263         // confusing to the user to have two uncommitted files.
1264         FileName path(owner_->filePath());
1265         string relFile(to_utf8(newFile.relPath(path.absFileName())));
1266         string cmd("svn move -q " + quoteName(onlyFileName(owner_->absFileName())) +
1267                    ' ' + quoteName(relFile));
1268         if (doVCCommand(cmd, path)) {
1269                 cmd = "svn revert -q " +
1270                         quoteName(onlyFileName(owner_->absFileName())) + ' ' +
1271                         quoteName(relFile);
1272                 doVCCommand(cmd, path);
1273                 if (newFile.exists())
1274                         newFile.removeFile();
1275                 return string();
1276         }
1277         vector<support::FileName> f;
1278         f.push_back(owner_->fileName());
1279         f.push_back(newFile);
1280         string log;
1281         if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
1282                 cmd = "svn revert -q " +
1283                         quoteName(onlyFileName(owner_->absFileName())) + ' ' +
1284                         quoteName(relFile);
1285                 doVCCommand(cmd, path);
1286                 if (newFile.exists())
1287                         newFile.removeFile();
1288                 return string();
1289         }
1290         return log;
1291 }
1292
1293
1294 bool SVN::copyEnabled()
1295 {
1296         return true;
1297 }
1298
1299
1300 string SVN::copy(support::FileName const & newFile, string const & msg)
1301 {
1302         // svn copy does not require a log message, since it does not commit.
1303         // In LyX we commit immediately afterwards, otherwise it could be
1304         // confusing to the user to have an uncommitted file.
1305         FileName path(owner_->filePath());
1306         string relFile(to_utf8(newFile.relPath(path.absFileName())));
1307         string cmd("svn copy -q " + quoteName(onlyFileName(owner_->absFileName())) +
1308                    ' ' + quoteName(relFile));
1309         if (doVCCommand(cmd, path))
1310                 return string();
1311         vector<support::FileName> f(1, newFile);
1312         string log;
1313         if (checkIn(f, msg, log) == LyXVC::VCSuccess)
1314                 return log;
1315         return string();
1316 }
1317
1318
1319 LyXVC::CommandResult SVN::checkIn(string const & msg, string & log)
1320 {
1321         vector<support::FileName> f(1, owner_->fileName());
1322         return checkIn(f, msg, log);
1323 }
1324
1325
1326 LyXVC::CommandResult
1327 SVN::checkIn(vector<support::FileName> const & f, string const & msg, string & log)
1328 {
1329         TempFile tempfile("lyxvcout");
1330         FileName tmpf = tempfile.name();
1331         if (tmpf.empty()){
1332                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1333                 log = N_("Error: Could not generate logfile.");
1334                 return LyXVC::ErrorBefore;
1335         }
1336
1337         ostringstream os;
1338         os << "svn commit -m \"" << msg << '"';
1339         for (size_t i = 0; i < f.size(); ++i)
1340                 os << ' ' << quoteName(f[i].onlyFileName());
1341         os << " > " << quoteName(tmpf.toFilesystemEncoding());
1342         LyXVC::CommandResult ret =
1343                 doVCCommand(os.str(), FileName(owner_->filePath())) ?
1344                         LyXVC::ErrorCommand : LyXVC::VCSuccess;
1345
1346         string res = scanLogFile(tmpf, log);
1347         if (!res.empty()) {
1348                 frontend::Alert::error(_("Revision control error."),
1349                                 _("Error when committing to repository.\n"
1350                                 "You have to manually resolve the problem.\n"
1351                                 "LyX will reopen the document after you press OK."));
1352                 ret = LyXVC::ErrorCommand;
1353         }
1354         else
1355                 if (!fileLock(false, tmpf, log))
1356                         ret = LyXVC::ErrorCommand;
1357
1358         if (!log.empty())
1359                 log.insert(0, "SVN: ");
1360         if (ret == LyXVC::VCSuccess && log.empty())
1361                 log = "SVN: Proceeded";
1362         return ret;
1363 }
1364
1365
1366 bool SVN::checkInEnabled()
1367 {
1368         if (locked_mode_)
1369                 return isLocked();
1370         else
1371                 return true;
1372 }
1373
1374
1375 bool SVN::isCheckInWithConfirmation()
1376 {
1377         // FIXME one day common getDiff and perhaps OpMode for all backends
1378
1379         TempFile tempfile("lyxvcout");
1380         FileName tmpf = tempfile.name();
1381         if (tmpf.empty()) {
1382                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1383                 return true;
1384         }
1385
1386         doVCCommandCall("svn diff " + quoteName(owner_->absFileName())
1387                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1388                 FileName(owner_->filePath()));
1389
1390         docstring diff = tmpf.fileContents("UTF-8");
1391
1392         if (diff.empty())
1393                 return false;
1394
1395         return true;
1396 }
1397
1398
1399 // FIXME Correctly return code should be checked instead of this.
1400 // This would need another solution than just plain startscript.
1401 // Hint from Andre': QProcess::readAllStandardError()...
1402 string SVN::scanLogFile(FileName const & f, string & status)
1403 {
1404         ifstream ifs(f.toFilesystemEncoding().c_str());
1405         string line;
1406
1407         while (ifs) {
1408                 getline(ifs, line);
1409                 LYXERR(Debug::LYXVC, line << '\n');
1410                 if (!line.empty())
1411                         status += line + "; ";
1412                 if (prefixIs(line, "C ") || prefixIs(line, "CU ")
1413                                          || contains(line, "Commit failed")) {
1414                         ifs.close();
1415                         return line;
1416                 }
1417                 if (contains(line, "svn:needs-lock")) {
1418                         ifs.close();
1419                         return line;
1420                 }
1421         }
1422         ifs.close();
1423         return string();
1424 }
1425
1426
1427 bool SVN::fileLock(bool lock, FileName const & tmpf, string &status)
1428 {
1429         if (!locked_mode_ || (isLocked() == lock))
1430                 return true;
1431
1432         string const arg = lock ? "lock " : "unlock ";
1433         doVCCommand("svn "+ arg + quoteName(onlyFileName(owner_->absFileName()))
1434                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1435                     FileName(owner_->filePath()));
1436
1437         // Lock error messages go unfortunately on stderr and are unreachable this way.
1438         ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1439         string line;
1440         while (ifs) {
1441                 getline(ifs, line);
1442                 if (!line.empty()) status += line + "; ";
1443         }
1444         ifs.close();
1445
1446         if (isLocked() == lock)
1447                 return true;
1448
1449         if (lock)
1450                 frontend::Alert::error(_("Revision control error."),
1451                         _("Error while acquiring write lock.\n"
1452                         "Another user is most probably editing\n"
1453                         "the current document now!\n"
1454                         "Also check the access to the repository."));
1455         else
1456                 frontend::Alert::error(_("Revision control error."),
1457                         _("Error while releasing write lock.\n"
1458                         "Check the access to the repository."));
1459         return false;
1460 }
1461
1462
1463 string SVN::checkOut()
1464 {
1465         TempFile tempfile("lyxvcout");
1466         FileName tmpf = tempfile.name();
1467         if (tmpf.empty()) {
1468                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1469                 return N_("Error: Could not generate logfile.");
1470         }
1471
1472         doVCCommand("svn update --non-interactive " + quoteName(onlyFileName(owner_->absFileName()))
1473                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1474                     FileName(owner_->filePath()));
1475
1476         string log;
1477         string const res = scanLogFile(tmpf, log);
1478         if (!res.empty())
1479                 frontend::Alert::error(_("Revision control error."),
1480                         bformat(_("Error when updating from repository.\n"
1481                                 "You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n"
1482                                 "After pressing OK, LyX will try to reopen the resolved document."),
1483                         from_local8bit(res)));
1484
1485         fileLock(true, tmpf, log);
1486
1487         return log.empty() ? string() : "SVN: " + log;
1488 }
1489
1490
1491 bool SVN::checkOutEnabled()
1492 {
1493         if (locked_mode_)
1494                 return !isLocked();
1495         else
1496                 return true;
1497 }
1498
1499
1500 string SVN::repoUpdate()
1501 {
1502         TempFile tempfile("lyxvcout");
1503         FileName tmpf = tempfile.name();
1504         if (tmpf.empty()) {
1505                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1506                 return N_("Error: Could not generate logfile.");
1507         }
1508
1509         doVCCommand("svn diff " + quoteName(owner_->filePath())
1510                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1511                 FileName(owner_->filePath()));
1512         docstring res = tmpf.fileContents("UTF-8");
1513         if (!res.empty()) {
1514                 LYXERR(Debug::LYXVC, "Diff detected:\n" << res);
1515                 docstring const file = from_utf8(owner_->filePath());
1516                 docstring text = bformat(_("There were detected changes "
1517                                 "in the working directory:\n%1$s\n\n"
1518                                 "In case of file conflict version of the local directory files "
1519                                 "will be preferred."
1520                                 "\n\nContinue?"), file);
1521                 int ret = frontend::Alert::prompt(_("Changes detected"),
1522                                 text, 0, 1, _("&Yes"), _("&No"), _("View &Log ..."));
1523                 if (ret == 2) {
1524                         dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
1525                         ret = frontend::Alert::prompt(_("Changes detected"),
1526                                 text, 0, 1, _("&Yes"), _("&No"));
1527                         hideDialogs("file", nullptr);
1528                 }
1529                 if (ret == 1)
1530                         return string();
1531         }
1532
1533         // Reverting looks too harsh, see bug #6255.
1534         // doVCCommand("svn revert -R " + quoteName(owner_->filePath())
1535         // + " > " + quoteName(tmpf.toFilesystemEncoding()),
1536         // FileName(owner_->filePath()));
1537         // res = "Revert log:\n" + tmpf.fileContents("UTF-8");
1538         doVCCommand("svn update --accept mine-full " + quoteName(owner_->filePath())
1539                 + " > " + quoteName(tmpf.toFilesystemEncoding()),
1540                 FileName(owner_->filePath()));
1541         res += "Update log:\n" + tmpf.fileContents("UTF-8");
1542
1543         LYXERR(Debug::LYXVC, res);
1544         return to_utf8(res);
1545 }
1546
1547
1548 bool SVN::repoUpdateEnabled()
1549 {
1550         return true;
1551 }
1552
1553
1554 string SVN::lockingToggle()
1555 {
1556         TempFile tempfile("lyxvcout");
1557         FileName tmpf = tempfile.name();
1558         if (tmpf.empty()) {
1559                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1560                 return N_("Error: Could not generate logfile.");
1561         }
1562
1563         int ret = doVCCommand("svn proplist " + quoteName(onlyFileName(owner_->absFileName()))
1564                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1565                     FileName(owner_->filePath()));
1566         if (ret)
1567                 return string();
1568
1569         string log;
1570         string res = scanLogFile(tmpf, log);
1571         bool locking = contains(res, "svn:needs-lock");
1572         if (!locking)
1573                 ret = doVCCommand("svn propset svn:needs-lock ON "
1574                     + quoteName(onlyFileName(owner_->absFileName()))
1575                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1576                     FileName(owner_->filePath()));
1577         else
1578                 ret = doVCCommand("svn propdel svn:needs-lock "
1579                     + quoteName(onlyFileName(owner_->absFileName()))
1580                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1581                     FileName(owner_->filePath()));
1582         if (ret)
1583                 return string();
1584
1585         frontend::Alert::warning(_("SVN File Locking"),
1586                 (locking ? _("Locking property unset.") : _("Locking property set.")) + '\n'
1587                 + _("Do not forget to commit the locking property into the repository."),
1588                 true);
1589
1590         return string("SVN: ") + (locking ?
1591                 N_("Locking property unset.") : N_("Locking property set."));
1592 }
1593
1594
1595 bool SVN::lockingToggleEnabled()
1596 {
1597         return true;
1598 }
1599
1600
1601 bool SVN::revert()
1602 {
1603         // Reverts to the version in SVN repository and
1604         // gets the updated version from the repository.
1605         string const fil = quoteName(onlyFileName(owner_->absFileName()));
1606
1607         if (doVCCommand("svn revert -q " + fil,
1608                     FileName(owner_->filePath())))
1609                 return false;
1610         owner_->markClean();
1611         return true;
1612 }
1613
1614
1615 bool SVN::isRevertWithConfirmation()
1616 {
1617         //FIXME owner && diff
1618         return true;
1619 }
1620
1621
1622 void SVN::undoLast()
1623 {
1624         // merge the current with the previous version
1625         // in a reverse patch kind of way, so that the
1626         // result is to revert the last changes.
1627         lyxerr << "Sorry, not implemented." << endl;
1628 }
1629
1630
1631 bool SVN::undoLastEnabled()
1632 {
1633         return false;
1634 }
1635
1636
1637 string SVN::revisionInfo(LyXVC::RevisionInfo const info)
1638 {
1639         if (info == LyXVC::Tree) {
1640                 if (rev_tree_cache_.empty())
1641                         if (!getTreeRevisionInfo())
1642                                 rev_tree_cache_ = "?";
1643                 if (rev_tree_cache_ == "?")
1644                         return string();
1645
1646                 return rev_tree_cache_;
1647         }
1648
1649         // fill the rest of the attributes for a single file
1650         if (rev_file_cache_.empty())
1651                 if (!getFileRevisionInfo())
1652                         rev_file_cache_ = "?";
1653
1654         switch (info) {
1655                 case LyXVC::File:
1656                         if (rev_file_cache_ == "?")
1657                                 return string();
1658                         return rev_file_cache_;
1659                 case LyXVC::Author:
1660                         return rev_author_cache_;
1661                 case LyXVC::Date:
1662                         return rev_date_cache_;
1663                 case LyXVC::Time:
1664                         return rev_time_cache_;
1665                 default:
1666                         break;
1667         }
1668
1669         return string();
1670 }
1671
1672
1673 bool SVN::getFileRevisionInfo()
1674 {
1675         TempFile tempfile("lyxvcout");
1676         FileName tmpf = tempfile.name();
1677         if (tmpf.empty()) {
1678                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1679                 return false;
1680         }
1681
1682         doVCCommand("svn info --xml " + quoteName(onlyFileName(owner_->absFileName()))
1683                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1684                     FileName(owner_->filePath()));
1685
1686         if (tmpf.empty())
1687                 return false;
1688
1689         ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1690         string line;
1691         // commit log part
1692         bool c = false;
1693         string rev;
1694
1695         while (ifs) {
1696                 getline(ifs, line);
1697                 LYXERR(Debug::LYXVC, line);
1698                 if (prefixIs(line, "<commit"))
1699                         c = true;
1700                 if (c && prefixIs(line, "   revision=\"") && suffixIs(line, "\">")) {
1701                         string l1 = subst(line, "revision=\"", "");
1702                         string l2 = trim(subst(l1, "\">", ""));
1703                         if (isStrInt(l2))
1704                                 rev_file_cache_ = rev = l2;
1705                 }
1706                 if (c && prefixIs(line, "<author>") && suffixIs(line, "</author>")) {
1707                         string l1 = subst(line, "<author>", "");
1708                         string l2 = subst(l1, "</author>", "");
1709                         rev_author_cache_ = l2;
1710                 }
1711                 if (c && prefixIs(line, "<date>") && suffixIs(line, "</date>")) {
1712                         string l1 = subst(line, "<date>", "");
1713                         string l2 = subst(l1, "</date>", "");
1714                         l2 = split(l2, l1, 'T');
1715                         rev_date_cache_ = l1;
1716                         l2 = split(l2, l1, '.');
1717                         rev_time_cache_ = l1;
1718                 }
1719         }
1720
1721         ifs.close();
1722         return !rev.empty();
1723 }
1724
1725
1726 bool SVN::getTreeRevisionInfo()
1727 {
1728         TempFile tempfile("lyxvcout");
1729         FileName tmpf = tempfile.name();
1730         if (tmpf.empty()) {
1731                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1732                 return false;
1733         }
1734
1735         doVCCommand("svnversion -n . > " + quoteName(tmpf.toFilesystemEncoding()),
1736                     FileName(owner_->filePath()));
1737
1738         if (tmpf.empty())
1739                 return false;
1740
1741         // only first line in case something bad happens.
1742         ifstream ifs(tmpf.toFilesystemEncoding().c_str());
1743         string line;
1744         getline(ifs, line);
1745         ifs.close();
1746
1747         rev_tree_cache_ = line;
1748         return !line.empty();
1749 }
1750
1751
1752 void SVN::getLog(FileName const & tmpf)
1753 {
1754         doVCCommand("svn log " + quoteName(onlyFileName(owner_->absFileName()))
1755                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1756                     FileName(owner_->filePath()));
1757 }
1758
1759
1760 bool SVN::prepareFileRevision(string const & revis, string & f)
1761 {
1762         if (!isStrInt(revis))
1763                 return false;
1764
1765         int rev = convert<int>(revis);
1766         if (rev <= 0)
1767                 if (!getFileRevisionInfo())
1768                         return false;
1769         if (rev == 0)
1770                 rev = convert<int>(rev_file_cache_);
1771         // go back for minus rev
1772         else if (rev < 0) {
1773                 rev = rev + convert<int>(rev_file_cache_);
1774                 if (rev < 1)
1775                         return false;
1776         }
1777
1778         string revname = convert<string>(rev);
1779         TempFile tempfile("lyxvcrev_" + revname + '_');
1780         tempfile.setAutoRemove(false);
1781         FileName tmpf = tempfile.name();
1782         if (tmpf.empty()) {
1783                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1784                 return false;
1785         }
1786
1787         doVCCommand("svn cat -r " + revname + ' '
1788                       + quoteName(onlyFileName(owner_->absFileName()))
1789                       + " > " + quoteName(tmpf.toFilesystemEncoding()),
1790                 FileName(owner_->filePath()));
1791         tmpf.refresh();
1792         if (tmpf.isFileEmpty())
1793                 return false;
1794
1795         f = tmpf.absFileName();
1796         return true;
1797 }
1798
1799
1800 bool SVN::prepareFileRevisionEnabled()
1801 {
1802         return true;
1803 }
1804
1805
1806
1807 bool SVN::toggleReadOnlyEnabled()
1808 {
1809         return false;
1810 }
1811
1812
1813 /////////////////////////////////////////////////////////////////////
1814 //
1815 // GIT
1816 //
1817 /////////////////////////////////////////////////////////////////////
1818
1819 GIT::GIT(Buffer * b) : VCS(b)
1820 {
1821         // Here we know that the buffer file is either already in GIT or
1822         // about to be registered
1823         scanMaster();
1824 }
1825
1826
1827 bool GIT::findFile(FileName const & file)
1828 {
1829         // First we check the existence of repository meta data.
1830         if (VCS::checkParentDirs(file, ".git").empty()) {
1831                 LYXERR(Debug::LYXVC, "Cannot find GIT meta data for " << file);
1832                 return false;
1833         }
1834
1835         // Now we check the status of the file.
1836         TempFile tempfile("lyxvcout");
1837         FileName tmpf = tempfile.name();
1838         if (tmpf.empty()) {
1839                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1840                 return false;
1841         }
1842
1843         string const fname = onlyFileName(file.absFileName());
1844         LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under git control for `"
1845                         << fname << '\'');
1846         doVCCommandCall("git ls-files " +
1847                         quoteName(fname) + " > " +
1848                         quoteName(tmpf.toFilesystemEncoding()),
1849                         file.onlyPath());
1850         tmpf.refresh();
1851         bool found = !tmpf.isFileEmpty();
1852         LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" : "disabled"));
1853         return found;
1854 }
1855
1856
1857 void GIT::scanMaster()
1858 {
1859         // vcstatus code is somewhat superflous,
1860         // until we want to implement read-only toggle for git.
1861         vcstatus_ = NOLOCKING;
1862 }
1863
1864
1865 bool GIT::retrieve(FileName const & file)
1866 {
1867         LYXERR(Debug::LYXVC, "LyXVC::GIT: retrieve.\n\t" << file);
1868         // The caller ensures that file does not exist, so no need to check that.
1869         return doVCCommandCall("git checkout -q " + quoteName(file.onlyFileName()),
1870                                file.onlyPath()) == 0;
1871 }
1872
1873
1874 void GIT::registrer(string const & /*msg*/)
1875 {
1876         doVCCommand("git add " + quoteName(onlyFileName(owner_->absFileName())),
1877                     FileName(owner_->filePath()));
1878 }
1879
1880
1881 bool GIT::renameEnabled()
1882 {
1883         return true;
1884 }
1885
1886
1887 string GIT::rename(support::FileName const & newFile, string const & msg)
1888 {
1889         // git mv does not require a log message, since it does not commit.
1890         // In LyX we commit immediately afterwards, otherwise it could be
1891         // confusing to the user to have two uncommitted files.
1892         FileName path(owner_->filePath());
1893         string relFile(to_utf8(newFile.relPath(path.absFileName())));
1894         string cmd("git mv " + quoteName(onlyFileName(owner_->absFileName())) +
1895                    ' ' + quoteName(relFile));
1896         if (doVCCommand(cmd, path)) {
1897                 cmd = "git checkout -q " +
1898                         quoteName(onlyFileName(owner_->absFileName())) + ' ' +
1899                         quoteName(relFile);
1900                 doVCCommand(cmd, path);
1901                 if (newFile.exists())
1902                         newFile.removeFile();
1903                 return string();
1904         }
1905         vector<support::FileName> f;
1906         f.push_back(owner_->fileName());
1907         f.push_back(newFile);
1908         string log;
1909         if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
1910                 cmd = "git checkout -q " +
1911                         quoteName(onlyFileName(owner_->absFileName())) + ' ' +
1912                         quoteName(relFile);
1913                 doVCCommand(cmd, path);
1914                 if (newFile.exists())
1915                         newFile.removeFile();
1916                 return string();
1917         }
1918         return log;
1919 }
1920
1921
1922 bool GIT::copyEnabled()
1923 {
1924         return false;
1925 }
1926
1927
1928 string GIT::copy(support::FileName const & /*newFile*/, string const & /*msg*/)
1929 {
1930         // git does not support copy with history preservation
1931         return string();
1932 }
1933
1934
1935 LyXVC::CommandResult GIT::checkIn(string const & msg, string & log)
1936 {
1937         vector<support::FileName> f(1, owner_->fileName());
1938         return checkIn(f, msg, log);
1939 }
1940
1941
1942 LyXVC::CommandResult
1943 GIT::checkIn(vector<support::FileName> const & f, string const & msg, string & log)
1944 {
1945         TempFile tempfile("lyxvcout");
1946         FileName tmpf = tempfile.name();
1947         if (tmpf.empty()){
1948                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1949                 log = N_("Error: Could not generate logfile.");
1950                 return LyXVC::ErrorBefore;
1951         }
1952
1953         ostringstream os;
1954         os << "git commit -m \"" << msg << '"';
1955         for (size_t i = 0; i < f.size(); ++i)
1956                 os << ' ' << quoteName(f[i].onlyFileName());
1957         os << " > " << quoteName(tmpf.toFilesystemEncoding());
1958         LyXVC::CommandResult ret =
1959                 doVCCommand(os.str(), FileName(owner_->filePath())) ?
1960                         LyXVC::ErrorCommand : LyXVC::VCSuccess;
1961
1962         string res = scanLogFile(tmpf, log);
1963         if (!res.empty()) {
1964                 frontend::Alert::error(_("Revision control error."),
1965                                 _("Error when committing to repository.\n"
1966                                 "You have to manually resolve the problem.\n"
1967                                 "LyX will reopen the document after you press OK."));
1968                 ret = LyXVC::ErrorCommand;
1969         }
1970
1971         if (!log.empty())
1972                 log.insert(0, "GIT: ");
1973         if (ret == LyXVC::VCSuccess && log.empty())
1974                 log = "GIT: Proceeded";
1975         return ret;
1976 }
1977
1978
1979 bool GIT::checkInEnabled()
1980 {
1981         return true;
1982 }
1983
1984
1985 bool GIT::isCheckInWithConfirmation()
1986 {
1987         // FIXME one day common getDiff and perhaps OpMode for all backends
1988
1989         TempFile tempfile("lyxvcout");
1990         FileName tmpf = tempfile.name();
1991         if (tmpf.empty()) {
1992                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
1993                 return true;
1994         }
1995
1996         doVCCommandCall("git diff " + quoteName(owner_->absFileName())
1997                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
1998                 FileName(owner_->filePath()));
1999
2000         docstring diff = tmpf.fileContents("UTF-8");
2001
2002         if (diff.empty())
2003                 return false;
2004
2005         return true;
2006 }
2007
2008
2009 // FIXME Correctly return code should be checked instead of this.
2010 // This would need another solution than just plain startscript.
2011 // Hint from Andre': QProcess::readAllStandardError()...
2012 string GIT::scanLogFile(FileName const & f, string & status)
2013 {
2014         ifstream ifs(f.toFilesystemEncoding().c_str());
2015         string line;
2016
2017         while (ifs) {
2018                 getline(ifs, line);
2019                 LYXERR(Debug::LYXVC, line << "\n");
2020                 if (!line.empty())
2021                         status += line + "; ";
2022                 if (prefixIs(line, "C ") || prefixIs(line, "CU ")
2023                                          || contains(line, "Commit failed")) {
2024                         ifs.close();
2025                         return line;
2026                 }
2027         }
2028         ifs.close();
2029         return string();
2030 }
2031
2032
2033 string GIT::checkOut()
2034 {
2035         return string();
2036 }
2037
2038
2039 bool GIT::checkOutEnabled()
2040 {
2041         return false;
2042 }
2043
2044
2045 string GIT::repoUpdate()
2046 {
2047         return string();
2048 }
2049
2050
2051 bool GIT::repoUpdateEnabled()
2052 {
2053         return false;
2054 }
2055
2056
2057 string GIT::lockingToggle()
2058 {
2059         return string();
2060 }
2061
2062
2063 bool GIT::lockingToggleEnabled()
2064 {
2065         return false;
2066 }
2067
2068
2069 bool GIT::revert()
2070 {
2071         // Reverts to the version in GIT repository and
2072         // gets the updated version from the repository.
2073         string const fil = quoteName(onlyFileName(owner_->absFileName()));
2074
2075         if (doVCCommand("git checkout -q " + fil,
2076                     FileName(owner_->filePath())))
2077                 return false;
2078         owner_->markClean();
2079         return true;
2080 }
2081
2082
2083 bool GIT::isRevertWithConfirmation()
2084 {
2085         //FIXME owner && diff
2086         return true;
2087 }
2088
2089
2090 void GIT::undoLast()
2091 {
2092         // merge the current with the previous version
2093         // in a reverse patch kind of way, so that the
2094         // result is to revert the last changes.
2095         lyxerr << "Sorry, not implemented." << endl;
2096 }
2097
2098
2099 bool GIT::undoLastEnabled()
2100 {
2101         return false;
2102 }
2103
2104
2105 string GIT::revisionInfo(LyXVC::RevisionInfo const info)
2106 {
2107         if (info == LyXVC::Tree) {
2108                 if (rev_tree_cache_.empty())
2109                         if (!getTreeRevisionInfo())
2110                                 rev_tree_cache_ = "?";
2111                 if (rev_tree_cache_ == "?")
2112                         return string();
2113
2114                 return rev_tree_cache_;
2115         }
2116
2117         // fill the rest of the attributes for a single file
2118         if (rev_file_cache_.empty())
2119                 if (!getFileRevisionInfo()) {
2120                         rev_file_cache_ = "?";
2121                         rev_file_abbrev_cache_ = "?";
2122     }
2123
2124         switch (info) {
2125                 case LyXVC::File:
2126                         if (rev_file_cache_ == "?")
2127                                 return string();
2128                         return rev_file_cache_;
2129                 case LyXVC::FileAbbrev:
2130                         if (rev_file_abbrev_cache_ == "?")
2131                                 return string();
2132                         return rev_file_abbrev_cache_;
2133                 case LyXVC::Author:
2134                         return rev_author_cache_;
2135                 case LyXVC::Date:
2136                         return rev_date_cache_;
2137                 case LyXVC::Time:
2138                         return rev_time_cache_;
2139                 default:
2140                         break;
2141         }
2142
2143         return string();
2144 }
2145
2146
2147 bool GIT::getFileRevisionInfo()
2148 {
2149         TempFile tempfile("lyxvcout");
2150         FileName tmpf = tempfile.name();
2151         if (tmpf.empty()) {
2152                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
2153                 return false;
2154         }
2155
2156         doVCCommand("git log -n 1 --pretty=format:%H%n%h%n%an%n%ai " + quoteName(onlyFileName(owner_->absFileName()))
2157                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
2158                     FileName(owner_->filePath()));
2159
2160         if (tmpf.empty())
2161                 return false;
2162
2163         ifstream ifs(tmpf.toFilesystemEncoding().c_str());
2164
2165         if (ifs)
2166                 getline(ifs, rev_file_cache_);
2167         if (ifs)
2168                 getline(ifs, rev_file_abbrev_cache_);
2169         if (ifs)
2170                 getline(ifs, rev_author_cache_);
2171         if (ifs) {
2172                 string line;
2173                 getline(ifs, line);
2174                 rev_time_cache_ = split(line, rev_date_cache_, ' ');
2175         }
2176
2177         ifs.close();
2178         return !rev_file_cache_.empty();
2179 }
2180
2181
2182 bool GIT::getTreeRevisionInfo()
2183 {
2184         TempFile tempfile("lyxvcout");
2185         FileName tmpf = tempfile.name();
2186         if (tmpf.empty()) {
2187                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
2188                 return false;
2189         }
2190
2191         doVCCommand("git describe --abbrev --dirty --long > " + quoteName(tmpf.toFilesystemEncoding()),
2192                     FileName(owner_->filePath()),
2193                     false); //git describe returns $?=128 when no tag found (but git repo still exists)
2194
2195         if (tmpf.empty())
2196                 return false;
2197
2198         // only first line in case something bad happens.
2199         ifstream ifs(tmpf.toFilesystemEncoding().c_str());
2200         getline(ifs, rev_tree_cache_);
2201         ifs.close();
2202
2203         return !rev_tree_cache_.empty();
2204 }
2205
2206
2207 void GIT::getLog(FileName const & tmpf)
2208 {
2209         doVCCommand("git log " + quoteName(onlyFileName(owner_->absFileName()))
2210                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
2211                     FileName(owner_->filePath()));
2212 }
2213
2214
2215 //at this moment we don't accept revision SHA, but just number of revision steps back
2216 //GUI and infrastucture needs to be changed first
2217 bool GIT::prepareFileRevision(string const & revis, string & f)
2218 {
2219         // anything positive means we got hash, not "0" or minus revision
2220         int rev = 1;
2221
2222         // hash is rarely number and should be long
2223         if (isStrInt(revis) && revis.length()<20)
2224                 rev = convert<int>(revis);
2225
2226         // revision and filename
2227         string pointer;
2228
2229         // go back for "minus" revisions
2230         if (rev <= 0)
2231                 pointer = "HEAD~" + convert<string>(-rev);
2232         // normal hash
2233         else
2234                 pointer = revis;
2235
2236         pointer += ':';
2237
2238         TempFile tempfile("lyxvcrev_" + revis + '_');
2239         tempfile.setAutoRemove(false);
2240         FileName tmpf = tempfile.name();
2241         if (tmpf.empty()) {
2242                 LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
2243                 return false;
2244         }
2245
2246         doVCCommand("git show " + pointer + "./"
2247                       + quoteName(onlyFileName(owner_->absFileName()))
2248                       + " > " + quoteName(tmpf.toFilesystemEncoding()),
2249                 FileName(owner_->filePath()));
2250         tmpf.refresh();
2251         if (tmpf.isFileEmpty())
2252                 return false;
2253
2254         f = tmpf.absFileName();
2255         return true;
2256 }
2257
2258
2259 bool GIT::prepareFileRevisionEnabled()
2260 {
2261         return true;
2262 }
2263
2264
2265 bool GIT::toggleReadOnlyEnabled()
2266 {
2267         return true;
2268 }
2269
2270
2271 } // namespace lyx