X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=957c69f585b48890ed38fdcfa1730da82f1dbf4c;hb=35f0117b5fbeee20e49e0b1e46f1ac938ae84afb;hp=719c3c2a1f58241be6f70c50e63cffcdd5632b2e;hpb=f4fe5a8fa0ff81dc01191d7085c743351c353369;p=lyx.git diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index 719c3c2a1f..957c69f585 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -13,6 +13,7 @@ #include "VCBackend.h" #include "Buffer.h" +#include "DispatchResult.h" #include "LyX.h" #include "FuncRequest.h" @@ -24,17 +25,19 @@ #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" -#include "support/Path.h" +#include "support/PathChanger.h" #include "support/Systemcall.h" #include "support/regex.h" +#include "support/TempFile.h" #include +#include +#include using namespace std; using namespace lyx::support; - namespace lyx { @@ -43,7 +46,7 @@ int VCS::doVCCommandCall(string const & cmd, FileName const & path) LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd); Systemcall one; support::PathChanger p(path); - return one.startscript(Systemcall::Wait, cmd, string(), false); + return one.startscript(Systemcall::Wait, cmd, string(), string(), false); } @@ -58,7 +61,7 @@ int VCS::doVCCommand(string const & cmd, FileName const & path, bool reportError owner_->setBusy(false); if (ret && reportError) frontend::Alert::error(_("Revision control error."), - bformat(_("Some problem occured while running the command:\n" + bformat(_("Some problem occurred while running the command:\n" "'%1$s'."), from_utf8(cmd))); return ret; @@ -68,14 +71,14 @@ int VCS::doVCCommand(string const & cmd, FileName const & path, bool reportError bool VCS::makeRCSRevision(string const &version, string &revis) const { string rev = revis; - + if (isStrInt(rev)) { int back = convert(rev); // if positive use as the last number in the whole revision string if (back > 0) { string base; - rsplit(version, base , '.' ); - rev = base + "." + rev; + rsplit(version, base , '.'); + rev = base + '.' + rev; } if (back == 0) rev = version; @@ -83,14 +86,14 @@ bool VCS::makeRCSRevision(string const &version, string &revis) const // in case of backward indexing if (back < 0) { string cur, base; - cur = rsplit(version, base , '.' ); + cur = rsplit(version, base , '.'); if (!isStrInt(cur)) return false; int want = convert(cur) + back; if (want <= 0) return false; - - rev = base + "." + convert(want); + + rev = base + '.' + convert(want); } } @@ -98,31 +101,32 @@ bool VCS::makeRCSRevision(string const &version, string &revis) const return true; } -bool VCS::checkparentdirs(FileName const & file, std::string const & pathname) + +bool VCS::checkparentdirs(FileName const & file, std::string const & vcsdir) { FileName dirname = file.onlyPath(); - FileName tocheck = FileName(addName(dirname.absFileName(),pathname)); - LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName()); - bool result = tocheck.exists(); - while ( !result && !dirname.empty() ) { + do { + FileName tocheck = FileName(addName(dirname.absFileName(), vcsdir)); + LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName()); + if (tocheck.exists()) + return true; //this construct because of #8295 dirname = FileName(dirname.absFileName()).parentPath(); - LYXERR(Debug::LYXVC, "check directory: " << dirname.absFileName()); - tocheck = FileName(addName(dirname.absFileName(),pathname)); - result = tocheck.exists(); - } - return result; + } while (!dirname.empty()); + return false; } - + ///////////////////////////////////////////////////////////////////// // // RCS // ///////////////////////////////////////////////////////////////////// -RCS::RCS(FileName const & m) +RCS::RCS(FileName const & m, Buffer * b) : VCS(b) { + // Here we know that the buffer file is either already in RCS or + // about to be registered master_ = m; scanMaster(); } @@ -150,11 +154,12 @@ FileName const RCS::findFile(FileName const & file) } -void RCS::retrieve(FileName const & file) +bool RCS::retrieve(FileName const & file) { LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file); - doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()), - FileName()); + // The caller ensures that file does not exist, so no need to check that. + return doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()), + FileName()) == 0; } @@ -166,6 +171,8 @@ void RCS::scanMaster() LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster: " << master_); ifstream ifs(master_.toFilesystemEncoding().c_str()); + // limit the size of strings we read to avoid memory problems + ifs >> setw(65636); string token; bool read_enough = false; @@ -231,18 +238,56 @@ void RCS::registrer(string const & msg) } -string RCS::checkIn(string const & msg) +bool RCS::renameEnabled() +{ + return false; +} + + +string RCS::rename(support::FileName const & /*newFile*/, string const & /*msg*/) +{ + // not implemented, since a left-over file.lyx,v would be confusing. + return string(); +} + + +bool RCS::copyEnabled() +{ + return true; +} + + +string RCS::copy(support::FileName const & newFile, string const & msg) +{ + // RCS has no real copy command, so we create a poor mans version + support::FileName const oldFile(owner_->absFileName()); + if (!oldFile.copyTo(newFile)) + return string(); + FileName path(oldFile.onlyPath()); + string relFile(to_utf8(newFile.relPath(path.absFileName()))); + string cmd = "ci -q -u -i -t-\""; + cmd += msg; + cmd += "\" "; + cmd += quoteName(relFile); + return doVCCommand(cmd, path) ? string() : "RCS: Proceeded"; +} + + +LyXVC::CommandResult RCS::checkIn(string const & msg, string & log) { int ret = doVCCommand("ci -q -u -m\"" + msg + "\" " + quoteName(onlyFileName(owner_->absFileName())), FileName(owner_->filePath())); - return ret ? string() : "RCS: Proceeded"; + if (ret) + return LyXVC::ErrorCommand; + log = "RCS: Proceeded"; + return LyXVC::VCSuccess; } bool RCS::checkInEnabled() { - return owner_ && !owner_->isReadonly(); + return owner_ && !owner_->hasReadonlyFlag(); } @@ -253,7 +298,8 @@ bool RCS::isCheckInWithConfirmation() // if (getDiff(file, diff) && diff.empty()) // return false; - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return true; @@ -264,7 +310,6 @@ bool RCS::isCheckInWithConfirmation() FileName(owner_->filePath())); docstring diff = tmpf.fileContents("UTF-8"); - tmpf.erase(); if (diff.empty()) return false; @@ -284,7 +329,7 @@ string RCS::checkOut() bool RCS::checkOutEnabled() { - return owner_ && owner_->isReadonly(); + return owner_ && owner_->hasReadonlyFlag(); } @@ -319,7 +364,7 @@ bool RCS::lockingToggleEnabled() bool RCS::revert() { - if (doVCCommand("co -f -u" + version_ + " " + if (doVCCommand("co -f -u" + version_ + ' ' + quoteName(onlyFileName(owner_->absFileName())), FileName(owner_->filePath()))) return false; @@ -339,7 +384,7 @@ bool RCS::isRevertWithConfirmation() void RCS::undoLast() { LYXERR(Debug::LYXVC, "LyXVC: undoLast"); - doVCCommand("rcs -o" + version_ + " " + doVCCommand("rcs -o" + version_ + ' ' + quoteName(onlyFileName(owner_->absFileName())), FileName(owner_->filePath())); } @@ -347,7 +392,7 @@ void RCS::undoLast() bool RCS::undoLastEnabled() { - return true; + return owner_->hasReadonlyFlag(); } @@ -385,7 +430,8 @@ string RCS::revisionInfo(LyXVC::RevisionInfo const info) return rev_date_cache_; case LyXVC::Time: return rev_time_cache_; - default: ; + default: + break; } return string(); @@ -394,7 +440,8 @@ string RCS::revisionInfo(LyXVC::RevisionInfo const info) bool RCS::getRevisionInfo() { - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return false; @@ -441,16 +488,19 @@ bool RCS::prepareFileRevision(string const &revis, string & f) if (!VCS::makeRCSRevision(version_, rev)) return false; - FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_"); + TempFile tempfile("lyxvcrev_" + rev + '_'); + tempfile.setAutoRemove(false); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return false; } - doVCCommand("co -p" + rev + " " + doVCCommand("co -p" + rev + ' ' + quoteName(onlyFileName(owner_->absFileName())) + " > " + quoteName(tmpf.toFilesystemEncoding()), FileName(owner_->filePath())); + tmpf.refresh(); if (tmpf.isFileEmpty()) return false; @@ -471,10 +521,11 @@ bool RCS::prepareFileRevisionEnabled() // ///////////////////////////////////////////////////////////////////// -CVS::CVS(FileName const & m, FileName const & f) +CVS::CVS(FileName const & m, Buffer * b) : VCS(b) { + // Here we know that the buffer file is either already in CVS or + // about to be registered master_ = m; - file_ = f; have_rev_info_ = false; scanMaster(); } @@ -509,7 +560,7 @@ void CVS::scanMaster() LYXERR(Debug::LYXVC, "LyXVC::CVS: scanMaster. \n Checking: " << master_); // Ok now we do the real scan... ifstream ifs(master_.toFilesystemEncoding().c_str()); - string name = onlyFileName(file_.absFileName()); + string name = onlyFileName(owner_->absFileName()); string tmpf = '/' + name + '/'; LYXERR(Debug::LYXVC, "\tlooking for `" << tmpf << '\''); string line; @@ -519,8 +570,10 @@ void CVS::scanMaster() if (contains(line, tmpf)) { // Ok extract the fields. smatch sm; - - regex_match(line, sm, reg); + if (!regex_match(line, sm, reg)) { + LYXERR(Debug::LYXVC, "\t Cannot parse line. Skipping."); + continue; + } //sm[0]; // whole matched string //sm[1]; // filename @@ -529,12 +582,13 @@ void CVS::scanMaster() //sm[4]; // options //sm[5]; // tag or tagdate - if (file_.isReadableFile()) { - time_t mod = file_.lastModified(); + FileName file(owner_->absFileName()); + if (file.isReadableFile()) { + time_t mod = file.lastModified(); string mod_date = rtrim(asctime(gmtime(&mod)), "\n"); LYXERR(Debug::LYXVC, "Date in Entries: `" << file_date << "'\nModification date of file: `" << mod_date << '\''); - if (file_.isReadOnly()) { + if (file.isReadOnly()) { // readonly checkout is unlocked vcstatus = UNLOCKED; } else { @@ -552,6 +606,15 @@ void CVS::scanMaster() } +bool CVS::retrieve(FileName const & file) +{ + LYXERR(Debug::LYXVC, "LyXVC::CVS: retrieve.\n\t" << file); + // The caller ensures that file does not exist, so no need to check that. + return doVCCommandCall("cvs -q update " + quoteName(file.toFilesystemEncoding()), + file.onlyPath()) == 0; +} + + string const CVS::getTarget(OperationMode opmode) const { switch(opmode) { @@ -584,7 +647,7 @@ docstring CVS::toString(CvsStatus status) const case StatusError: return _("Cannot retrieve CVS status"); } - return 0; + return docstring(); } @@ -607,7 +670,8 @@ int CVS::doVCCommandCallWithOutput(std::string const & cmd, CVS::CvsStatus CVS::getStatus() { - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return StatusError; @@ -615,7 +679,6 @@ CVS::CvsStatus CVS::getStatus() if (doVCCommandCallWithOutput("cvs status " + getTarget(File), FileName(owner_->filePath()), tmpf)) { - tmpf.removeFile(); return StatusError; } @@ -625,7 +688,7 @@ CVS::CvsStatus CVS::getStatus() while (ifs) { string line; getline(ifs, line); - LYXERR(Debug::LYXVC, line << "\n"); + LYXERR(Debug::LYXVC, line << '\n'); if (prefixIs(line, "File:")) { if (contains(line, "Up-to-date")) status = UpToDate; @@ -639,7 +702,6 @@ CVS::CvsStatus CVS::getStatus() status = NeedsCheckout; } } - tmpf.removeFile(); return status; } @@ -648,28 +710,28 @@ void CVS::getRevisionInfo() if (have_rev_info_) return; have_rev_info_ = true; - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return; } - - int rc = doVCCommandCallWithOutput("cvs log -r" + version_ - + " " + getTarget(File), + + int rc = doVCCommandCallWithOutput("cvs log -r" + version_ + + ' ' + getTarget(File), FileName(owner_->filePath()), tmpf); if (rc) { - tmpf.removeFile(); LYXERR(Debug::LYXVC, "cvs log failed with exit code " << rc); return; } - + ifstream ifs(tmpf.toFilesystemEncoding().c_str()); static regex const reg("date: (.*) (.*) (.*); author: (.*); state: (.*);(.*)"); while (ifs) { string line; getline(ifs, line); - LYXERR(Debug::LYXVC, line << "\n"); + LYXERR(Debug::LYXVC, line << '\n'); if (prefixIs(line, "date:")) { smatch sm; regex_match(line, sm, reg); @@ -681,7 +743,6 @@ void CVS::getRevisionInfo() break; } } - tmpf.removeFile(); if (rev_author_cache_.empty()) LYXERR(Debug::LYXVC, "Could not retrieve revision info for " << version_ << @@ -697,6 +758,45 @@ void CVS::registrer(string const & msg) } +bool CVS::renameEnabled() +{ + return true; +} + + +string CVS::rename(support::FileName const & newFile, string const & msg) +{ + // CVS has no real rename command, so we create a poor mans version + support::FileName const oldFile(owner_->absFileName()); + string ret = copy(newFile, msg); + if (ret.empty()) + return ret; + string cmd = "cvs -q remove -m \"" + msg + "\" " + + quoteName(oldFile.onlyFileName()); + FileName path(oldFile.onlyPath()); + return doVCCommand(cmd, path) ? string() : ret; +} + + +bool CVS::copyEnabled() +{ + return true; +} + + +string CVS::copy(support::FileName const & newFile, string const & msg) +{ + // CVS has no real copy command, so we create a poor mans version + support::FileName const oldFile(owner_->absFileName()); + if (!oldFile.copyTo(newFile)) + return string(); + FileName path(oldFile.onlyPath()); + string relFile(to_utf8(newFile.relPath(path.absFileName()))); + string cmd("cvs -q add -m \"" + msg + "\" " + quoteName(relFile)); + return doVCCommand(cmd, path) ? string() : "CVS: Proceeded"; +} + + void CVS::getDiff(OperationMode opmode, FileName const & tmpf) { doVCCommandWithOutput("cvs diff " + getTarget(opmode), @@ -735,7 +835,7 @@ string CVS::scanLogFile(FileName const & f, string & status) while (ifs) { string line; getline(ifs, line); - LYXERR(Debug::LYXVC, line << "\n"); + LYXERR(Debug::LYXVC, line << '\n'); if (!line.empty()) status += line + "; "; if (prefixIs(line, "C ")) { @@ -746,22 +846,27 @@ string CVS::scanLogFile(FileName const & f, string & status) ifs.close(); return string(); } - - -string CVS::checkIn(string const & msg) + + +LyXVC::CommandResult CVS::checkIn(string const & msg, string & log) { CvsStatus status = getStatus(); switch (status) { case UpToDate: if (vcstatus != NOLOCKING) - unedit(); - return "CVS: Proceeded"; + if (unedit()) + return LyXVC::ErrorCommand; + log = "CVS: Proceeded"; + return LyXVC::VCSuccess; case LocallyModified: case LocallyAdded: { int rc = doVCCommand("cvs -q commit -m \"" + msg + "\" " + getTarget(File), FileName(owner_->filePath())); - return rc ? string() : "CVS: Proceeded"; + if (rc) + return LyXVC::ErrorCommand; + log = "CVS: Proceeded"; + return LyXVC::VCSuccess; } case NeedsMerge: case NeedsCheckout: @@ -776,7 +881,7 @@ string CVS::checkIn(string const & msg) toString(status))); break; } - return string(); + return LyXVC::ErrorBefore; } @@ -808,12 +913,13 @@ string CVS::checkOut() { if (vcstatus != NOLOCKING && edit()) return string(); - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return string(); } - + int rc = update(File, tmpf); string log; string const res = scanLogFile(tmpf, log); @@ -825,8 +931,7 @@ string CVS::checkOut() from_local8bit(res))); rc = 0; } - - tmpf.erase(); + return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log; } @@ -842,12 +947,13 @@ bool CVS::checkOutEnabled() string CVS::repoUpdate() { - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return string(); } - + getDiff(Directory, tmpf); docstring res = tmpf.fileContents("UTF-8"); if (!res.empty()) { @@ -859,16 +965,14 @@ string CVS::repoUpdate() "or you will need to revert back to the repository version."), file); int ret = frontend::Alert::prompt(_("Changes detected"), text, 0, 1, _("&Continue"), _("&Abort"), _("View &Log ...")); - if (ret == 2 ) { + if (ret == 2) { dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName())); ret = frontend::Alert::prompt(_("Changes detected"), text, 0, 1, _("&Continue"), _("&Abort")); hideDialogs("file", 0); } - if (ret == 1 ) { - tmpf.removeFile(); + if (ret == 1) return string(); - } } int rc = update(Directory, tmpf); @@ -886,8 +990,6 @@ string CVS::repoUpdate() file, from_local8bit(sres))); rc = 0; } - - tmpf.removeFile(); return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log; } @@ -1001,7 +1103,8 @@ string CVS::revisionInfo(LyXVC::RevisionInfo const info) return rev_date_cache_; case LyXVC::Time: return rev_time_cache_; - default: ; + default: + break; } } return string(); @@ -1014,15 +1117,18 @@ bool CVS::prepareFileRevision(string const & revis, string & f) if (!VCS::makeRCSRevision(version_, rev)) return false; - FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_"); + TempFile tempfile("lyxvcrev_" + rev + '_'); + tempfile.setAutoRemove(false); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return false; } - doVCCommandWithOutput("cvs update -p -r" + rev + " " + doVCCommandWithOutput("cvs update -p -r" + rev + ' ' + getTarget(File), FileName(owner_->filePath()), tmpf); + tmpf.refresh(); if (tmpf.isFileEmpty()) return false; @@ -1043,11 +1149,11 @@ bool CVS::prepareFileRevisionEnabled() // ///////////////////////////////////////////////////////////////////// -SVN::SVN(FileName const & m, FileName const & f) +SVN::SVN(FileName const & m, Buffer * b) : VCS(b) { - owner_ = 0; + // Here we know that the buffer file is either already in SVN or + // about to be registered master_ = m; - file_ = f; locked_mode_ = 0; scanMaster(); } @@ -1062,7 +1168,8 @@ FileName const SVN::findFile(FileName const & file) } // Now we check the status of the file. - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return FileName(); @@ -1080,31 +1187,31 @@ FileName const SVN::findFile(FileName const & file) void SVN::scanMaster() { - // vcstatus code is somewhat superflous, until we want - // to implement read-only toggle for svn. + // vcstatus code is somewhat superflous, + // until we want to implement read-only toggle for svn. vcstatus = NOLOCKING; if (checkLockMode()) { - if (isLocked()) { + if (isLocked()) vcstatus = LOCKED; - } else { + else vcstatus = UNLOCKED; - } } } bool SVN::checkLockMode() { - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()){ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return false; } LYXERR(Debug::LYXVC, "Detecting locking mode..."); - if (doVCCommandCall("svn proplist " + quoteName(file_.onlyFileName()) + if (doVCCommandCall("svn proplist " + quoteName(onlyFileName(owner_->absFileName())) + " > " + quoteName(tmpf.toFilesystemEncoding()), - file_.onlyPath())) + FileName(owner_->filePath()))) return false; ifstream ifs(tmpf.toFilesystemEncoding().c_str()); @@ -1127,8 +1234,18 @@ bool SVN::checkLockMode() bool SVN::isLocked() const { - file_.refresh(); - return !file_.isReadOnly(); + FileName file(owner_->absFileName()); + file.refresh(); + return !file.isReadOnly(); +} + + +bool SVN::retrieve(FileName const & file) +{ + LYXERR(Debug::LYXVC, "LyXVC::SVN: retrieve.\n\t" << file); + // The caller ensures that file does not exist, so no need to check that. + return doVCCommandCall("svn update -q --non-interactive " + quoteName(file.onlyFileName()), + file.onlyPath()) == 0; } @@ -1139,31 +1256,116 @@ void SVN::registrer(string const & /*msg*/) } -string SVN::checkIn(string const & msg) +bool SVN::renameEnabled() { - FileName tmpf = FileName::tempName("lyxvcout"); + return true; +} + + +string SVN::rename(support::FileName const & newFile, string const & msg) +{ + // svn move does not require a log message, since it does not commit. + // In LyX we commit immediately afterwards, otherwise it could be + // confusing to the user to have two uncommitted files. + FileName path(owner_->filePath()); + string relFile(to_utf8(newFile.relPath(path.absFileName()))); + string cmd("svn move -q " + quoteName(onlyFileName(owner_->absFileName())) + + ' ' + quoteName(relFile)); + if (doVCCommand(cmd, path)) { + cmd = "svn revert -q " + + quoteName(onlyFileName(owner_->absFileName())) + ' ' + + quoteName(relFile); + doVCCommand(cmd, path); + if (newFile.exists()) + newFile.removeFile(); + return string(); + } + vector f; + f.push_back(owner_->fileName()); + f.push_back(newFile); + string log; + if (checkIn(f, msg, log) != LyXVC::VCSuccess) { + cmd = "svn revert -q " + + quoteName(onlyFileName(owner_->absFileName())) + ' ' + + quoteName(relFile); + doVCCommand(cmd, path); + if (newFile.exists()) + newFile.removeFile(); + return string(); + } + return log; +} + + +bool SVN::copyEnabled() +{ + return true; +} + + +string SVN::copy(support::FileName const & newFile, string const & msg) +{ + // svn copy does not require a log message, since it does not commit. + // In LyX we commit immediately afterwards, otherwise it could be + // confusing to the user to have an uncommitted file. + FileName path(owner_->filePath()); + string relFile(to_utf8(newFile.relPath(path.absFileName()))); + string cmd("svn copy -q " + quoteName(onlyFileName(owner_->absFileName())) + + ' ' + quoteName(relFile)); + if (doVCCommand(cmd, path)) + return string(); + vector f(1, newFile); + string log; + if (checkIn(f, msg, log) == LyXVC::VCSuccess) + return log; + return string(); +} + + +LyXVC::CommandResult SVN::checkIn(string const & msg, string & log) +{ + vector f(1, owner_->fileName()); + return checkIn(f, msg, log); +} + + +LyXVC::CommandResult +SVN::checkIn(vector const & f, string const & msg, string & log) +{ + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()){ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); - return N_("Error: Could not generate logfile."); + log = N_("Error: Could not generate logfile."); + return LyXVC::ErrorBefore; } - doVCCommand("svn commit -m \"" + msg + "\" " - + quoteName(onlyFileName(owner_->absFileName())) - + " > " + quoteName(tmpf.toFilesystemEncoding()), - FileName(owner_->filePath())); + ostringstream os; + os << "svn commit -m \"" << msg << '"'; + for (size_t i = 0; i < f.size(); ++i) + os << ' ' << quoteName(f[i].onlyFileName()); + os << " > " << quoteName(tmpf.toFilesystemEncoding()); + LyXVC::CommandResult ret = + doVCCommand(os.str(), FileName(owner_->filePath())) ? + LyXVC::ErrorCommand : LyXVC::VCSuccess; - string log; string res = scanLogFile(tmpf, log); - if (!res.empty()) + if (!res.empty()) { frontend::Alert::error(_("Revision control error."), _("Error when committing to repository.\n" "You have to manually resolve the problem.\n" "LyX will reopen the document after you press OK.")); + ret = LyXVC::ErrorCommand; + } else - fileLock(false, tmpf, log); + if (!fileLock(false, tmpf, log)) + ret = LyXVC::ErrorCommand; - tmpf.erase(); - return log.empty() ? string() : "SVN: " + log; + if (!log.empty()) + log.insert(0, "SVN: "); + if (ret == LyXVC::VCSuccess && log.empty()) + log = "SVN: Proceeded"; + return ret; } @@ -1180,7 +1382,8 @@ bool SVN::isCheckInWithConfirmation() { // FIXME one day common getDiff and perhaps OpMode for all backends - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return true; @@ -1191,7 +1394,6 @@ bool SVN::isCheckInWithConfirmation() FileName(owner_->filePath())); docstring diff = tmpf.fileContents("UTF-8"); - tmpf.erase(); if (diff.empty()) return false; @@ -1210,8 +1412,8 @@ string SVN::scanLogFile(FileName const & f, string & status) while (ifs) { getline(ifs, line); - LYXERR(Debug::LYXVC, line << "\n"); - if (!line.empty()) + LYXERR(Debug::LYXVC, line << '\n'); + if (!line.empty()) status += line + "; "; if (prefixIs(line, "C ") || prefixIs(line, "CU ") || contains(line, "Commit failed")) { @@ -1228,17 +1430,17 @@ string SVN::scanLogFile(FileName const & f, string & status) } -void SVN::fileLock(bool lock, FileName const & tmpf, string &status) +bool SVN::fileLock(bool lock, FileName const & tmpf, string &status) { if (!locked_mode_ || (isLocked() == lock)) - return; + return true; string const arg = lock ? "lock " : "unlock "; doVCCommand("svn "+ arg + quoteName(onlyFileName(owner_->absFileName())) + " > " + quoteName(tmpf.toFilesystemEncoding()), FileName(owner_->filePath())); - // Lock error messages go unfortunately on stderr and are unreachible this way. + // Lock error messages go unfortunately on stderr and are unreachable this way. ifstream ifs(tmpf.toFilesystemEncoding().c_str()); string line; while (ifs) { @@ -1247,22 +1449,27 @@ void SVN::fileLock(bool lock, FileName const & tmpf, string &status) } ifs.close(); - if (!isLocked() && lock) + if (isLocked() == lock) + return true; + + if (lock) frontend::Alert::error(_("Revision control error."), _("Error while acquiring write lock.\n" "Another user is most probably editing\n" "the current document now!\n" "Also check the access to the repository.")); - if (isLocked() && !lock) + else frontend::Alert::error(_("Revision control error."), _("Error while releasing write lock.\n" "Check the access to the repository.")); + return false; } string SVN::checkOut() { - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return N_("Error: Could not generate logfile."); @@ -1283,7 +1490,6 @@ string SVN::checkOut() fileLock(true, tmpf, log); - tmpf.erase(); return log.empty() ? string() : "SVN: " + log; } @@ -1299,7 +1505,8 @@ bool SVN::checkOutEnabled() string SVN::repoUpdate() { - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return N_("Error: Could not generate logfile."); @@ -1319,16 +1526,14 @@ string SVN::repoUpdate() "\n\nContinue?"), file); int ret = frontend::Alert::prompt(_("Changes detected"), text, 0, 1, _("&Yes"), _("&No"), _("View &Log ...")); - if (ret == 2 ) { + if (ret == 2) { dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName())); ret = frontend::Alert::prompt(_("Changes detected"), text, 0, 1, _("&Yes"), _("&No")); hideDialogs("file", 0); } - if (ret == 1 ) { - tmpf.erase(); + if (ret == 1) return string(); - } } // Reverting looks too harsh, see bug #6255. @@ -1342,7 +1547,6 @@ string SVN::repoUpdate() res += "Update log:\n" + tmpf.fileContents("UTF-8"); LYXERR(Debug::LYXVC, res); - tmpf.erase(); return to_utf8(res); } @@ -1355,7 +1559,8 @@ bool SVN::repoUpdateEnabled() string SVN::lockingToggle() { - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return N_("Error: Could not generate logfile."); @@ -1383,13 +1588,13 @@ string SVN::lockingToggle() if (ret) return string(); - tmpf.erase(); - frontend::Alert::warning(_("VCN File Locking"), - (locking ? _("Locking property unset.") : _("Locking property set.")) + "\n" + frontend::Alert::warning(_("SVN File Locking"), + (locking ? _("Locking property unset.") : _("Locking property set.")) + '\n' + _("Do not forget to commit the locking property into the repository."), true); - return string("SVN: ") + N_("Locking property set."); + return string("SVN: ") + (locking ? + N_("Locking property unset.") : N_("Locking property set.")); } @@ -1438,13 +1643,13 @@ bool SVN::undoLastEnabled() string SVN::revisionInfo(LyXVC::RevisionInfo const info) { if (info == LyXVC::Tree) { - if (rev_tree_cache_.empty()) - if (!getTreeRevisionInfo()) - rev_tree_cache_ = "?"; - if (rev_tree_cache_ == "?") - return string(); + if (rev_tree_cache_.empty()) + if (!getTreeRevisionInfo()) + rev_tree_cache_ = "?"; + if (rev_tree_cache_ == "?") + return string(); - return rev_tree_cache_; + return rev_tree_cache_; } // fill the rest of the attributes for a single file @@ -1463,8 +1668,8 @@ string SVN::revisionInfo(LyXVC::RevisionInfo const info) return rev_date_cache_; case LyXVC::Time: return rev_time_cache_; - default: ; - + default: + break; } return string(); @@ -1473,7 +1678,8 @@ string SVN::revisionInfo(LyXVC::RevisionInfo const info) bool SVN::getFileRevisionInfo() { - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return false; @@ -1519,14 +1725,14 @@ bool SVN::getFileRevisionInfo() } ifs.close(); - tmpf.erase(); return !rev.empty(); } bool SVN::getTreeRevisionInfo() { - FileName tmpf = FileName::tempName("lyxvcout"); + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return false; @@ -1543,7 +1749,6 @@ bool SVN::getTreeRevisionInfo() string line; getline(ifs, line); ifs.close(); - tmpf.erase(); rev_tree_cache_ = line; return !line.empty(); @@ -1577,16 +1782,19 @@ bool SVN::prepareFileRevision(string const & revis, string & f) } string revname = convert(rev); - FileName tmpf = FileName::tempName("lyxvcrev_" + revname + "_"); + TempFile tempfile("lyxvcrev_" + revname + '_'); + tempfile.setAutoRemove(false); + FileName tmpf = tempfile.name(); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return false; } - doVCCommand("svn cat -r " + revname + " " + doVCCommand("svn cat -r " + revname + ' ' + quoteName(onlyFileName(owner_->absFileName())) + " > " + quoteName(tmpf.toFilesystemEncoding()), FileName(owner_->filePath())); + tmpf.refresh(); if (tmpf.isFileEmpty()) return false; @@ -1608,4 +1816,454 @@ bool SVN::toggleReadOnlyEnabled() } +///////////////////////////////////////////////////////////////////// +// +// GIT +// +///////////////////////////////////////////////////////////////////// + +GIT::GIT(FileName const & m, Buffer * b) : VCS(b) +{ + // Here we know that the buffer file is either already in GIT or + // about to be registered + master_ = m; + scanMaster(); +} + + +FileName const GIT::findFile(FileName const & file) +{ + // First we check the existence of repository meta data. + if (!VCS::checkparentdirs(file, ".git")) { + LYXERR(Debug::LYXVC, "Cannot find GIT meta data for " << file); + return FileName(); + } + + // Now we check the status of the file. + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); + if (tmpf.empty()) { + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return FileName(); + } + + string const fname = onlyFileName(file.absFileName()); + LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under git control for `" + << fname << '\''); + doVCCommandCall("git ls-files " + + quoteName(fname) + " > " + + quoteName(tmpf.toFilesystemEncoding()), + file.onlyPath()); + tmpf.refresh(); + bool found = !tmpf.isFileEmpty(); + LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" : "disabled")); + return found ? file : FileName(); +} + + +void GIT::scanMaster() +{ + // vcstatus code is somewhat superflous, + // until we want to implement read-only toggle for git. + vcstatus = NOLOCKING; +} + + +bool GIT::retrieve(FileName const & file) +{ + LYXERR(Debug::LYXVC, "LyXVC::GIT: retrieve.\n\t" << file); + // The caller ensures that file does not exist, so no need to check that. + return doVCCommandCall("git checkout -q " + quoteName(file.onlyFileName()), + file.onlyPath()) == 0; +} + + +void GIT::registrer(string const & /*msg*/) +{ + doVCCommand("git add " + quoteName(onlyFileName(owner_->absFileName())), + FileName(owner_->filePath())); +} + + +bool GIT::renameEnabled() +{ + return true; +} + + +string GIT::rename(support::FileName const & newFile, string const & msg) +{ + // git mv does not require a log message, since it does not commit. + // In LyX we commit immediately afterwards, otherwise it could be + // confusing to the user to have two uncommitted files. + FileName path(owner_->filePath()); + string relFile(to_utf8(newFile.relPath(path.absFileName()))); + string cmd("git mv " + quoteName(onlyFileName(owner_->absFileName())) + + ' ' + quoteName(relFile)); + if (doVCCommand(cmd, path)) { + cmd = "git checkout -q " + + quoteName(onlyFileName(owner_->absFileName())) + ' ' + + quoteName(relFile); + doVCCommand(cmd, path); + if (newFile.exists()) + newFile.removeFile(); + return string(); + } + vector f; + f.push_back(owner_->fileName()); + f.push_back(newFile); + string log; + if (checkIn(f, msg, log) != LyXVC::VCSuccess) { + cmd = "git checkout -q " + + quoteName(onlyFileName(owner_->absFileName())) + ' ' + + quoteName(relFile); + doVCCommand(cmd, path); + if (newFile.exists()) + newFile.removeFile(); + return string(); + } + return log; +} + + +bool GIT::copyEnabled() +{ + return false; +} + + +string GIT::copy(support::FileName const & /*newFile*/, string const & /*msg*/) +{ + // git does not support copy with history preservation + return string(); +} + + +LyXVC::CommandResult GIT::checkIn(string const & msg, string & log) +{ + vector f(1, owner_->fileName()); + return checkIn(f, msg, log); +} + + +LyXVC::CommandResult +GIT::checkIn(vector const & f, string const & msg, string & log) +{ + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); + if (tmpf.empty()){ + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + log = N_("Error: Could not generate logfile."); + return LyXVC::ErrorBefore; + } + + ostringstream os; + os << "git commit -m \"" << msg << '"'; + for (size_t i = 0; i < f.size(); ++i) + os << ' ' << quoteName(f[i].onlyFileName()); + os << " > " << quoteName(tmpf.toFilesystemEncoding()); + LyXVC::CommandResult ret = + doVCCommand(os.str(), FileName(owner_->filePath())) ? + LyXVC::ErrorCommand : LyXVC::VCSuccess; + + string res = scanLogFile(tmpf, log); + if (!res.empty()) { + frontend::Alert::error(_("Revision control error."), + _("Error when committing to repository.\n" + "You have to manually resolve the problem.\n" + "LyX will reopen the document after you press OK.")); + ret = LyXVC::ErrorCommand; + } + + if (!log.empty()) + log.insert(0, "GIT: "); + if (ret == LyXVC::VCSuccess && log.empty()) + log = "GIT: Proceeded"; + return ret; +} + + +bool GIT::checkInEnabled() +{ + return true; +} + + +bool GIT::isCheckInWithConfirmation() +{ + // FIXME one day common getDiff and perhaps OpMode for all backends + + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); + if (tmpf.empty()) { + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return true; + } + + doVCCommandCall("git diff " + quoteName(owner_->absFileName()) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + + docstring diff = tmpf.fileContents("UTF-8"); + + if (diff.empty()) + return false; + + return true; +} + + +// FIXME Correctly return code should be checked instead of this. +// This would need another solution than just plain startscript. +// Hint from Andre': QProcess::readAllStandardError()... +string GIT::scanLogFile(FileName const & f, string & status) +{ + ifstream ifs(f.toFilesystemEncoding().c_str()); + string line; + + while (ifs) { + getline(ifs, line); + LYXERR(Debug::LYXVC, line << "\n"); + if (!line.empty()) + status += line + "; "; + if (prefixIs(line, "C ") || prefixIs(line, "CU ") + || contains(line, "Commit failed")) { + ifs.close(); + return line; + } + } + ifs.close(); + return string(); +} + + +string GIT::checkOut() +{ + return string(); +} + + +bool GIT::checkOutEnabled() +{ + return false; +} + + +string GIT::repoUpdate() +{ + return string(); +} + + +bool GIT::repoUpdateEnabled() +{ + return false; +} + + +string GIT::lockingToggle() +{ + return string(); +} + + +bool GIT::lockingToggleEnabled() +{ + return false; +} + + +bool GIT::revert() +{ + // Reverts to the version in GIT repository and + // gets the updated version from the repository. + string const fil = quoteName(onlyFileName(owner_->absFileName())); + + if (doVCCommand("git checkout -q " + fil, + FileName(owner_->filePath()))) + return false; + owner_->markClean(); + return true; +} + + +bool GIT::isRevertWithConfirmation() +{ + //FIXME owner && diff + return true; +} + + +void GIT::undoLast() +{ + // merge the current with the previous version + // in a reverse patch kind of way, so that the + // result is to revert the last changes. + lyxerr << "Sorry, not implemented." << endl; +} + + +bool GIT::undoLastEnabled() +{ + return false; +} + + +string GIT::revisionInfo(LyXVC::RevisionInfo const info) +{ + if (info == LyXVC::Tree) { + if (rev_tree_cache_.empty()) + if (!getTreeRevisionInfo()) + rev_tree_cache_ = "?"; + if (rev_tree_cache_ == "?") + return string(); + + return rev_tree_cache_; + } + + // fill the rest of the attributes for a single file + if (rev_file_cache_.empty()) + if (!getFileRevisionInfo()) + rev_file_cache_ = "?"; + + switch (info) { + case LyXVC::File: + if (rev_file_cache_ == "?") + return string(); + return rev_file_cache_; + case LyXVC::Author: + return rev_author_cache_; + case LyXVC::Date: + return rev_date_cache_; + case LyXVC::Time: + return rev_time_cache_; + default: + break; + } + + return string(); +} + + +bool GIT::getFileRevisionInfo() +{ + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); + if (tmpf.empty()) { + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return false; + } + + doVCCommand("git log -n 1 --pretty=format:%H%n%an%n%ai " + quoteName(onlyFileName(owner_->absFileName())) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + + if (tmpf.empty()) + return false; + + ifstream ifs(tmpf.toFilesystemEncoding().c_str()); + + if (ifs) + getline(ifs, rev_file_cache_); + if (ifs) + getline(ifs, rev_author_cache_); + if (ifs) { + string line; + getline(ifs, line); + rev_time_cache_ = split(line, rev_date_cache_, ' '); + } + + ifs.close(); + return !rev_file_cache_.empty(); +} + + +bool GIT::getTreeRevisionInfo() +{ + TempFile tempfile("lyxvcout"); + FileName tmpf = tempfile.name(); + if (tmpf.empty()) { + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return false; + } + + doVCCommand("git describe --abbrev --dirty --long > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + + if (tmpf.empty()) + return false; + + // only first line in case something bad happens. + ifstream ifs(tmpf.toFilesystemEncoding().c_str()); + getline(ifs, rev_tree_cache_); + ifs.close(); + + return !rev_tree_cache_.empty(); +} + + +void GIT::getLog(FileName const & tmpf) +{ + doVCCommand("git log " + quoteName(onlyFileName(owner_->absFileName())) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); +} + + +//at this moment we don't accept revision SHA, but just number of revision steps back +//GUI and infrastucture needs to be changed first +bool GIT::prepareFileRevision(string const & revis, string & f) +{ + // anything positive means we got hash, not "0" or minus revision + int rev = 1; + + // hash is rarely number and should be long + if (isStrInt(revis) && revis.length()<20) + rev = convert(revis); + + // revision and filename + string pointer; + + // go back for "minus" revisions + if (rev <= 0) + pointer = "HEAD~" + convert(-rev); + // normal hash + else + pointer = revis; + + pointer += ':'; + + TempFile tempfile("lyxvcrev_" + revis + '_'); + tempfile.setAutoRemove(false); + FileName tmpf = tempfile.name(); + if (tmpf.empty()) { + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return false; + } + + doVCCommand("git show " + pointer + "./" + + quoteName(onlyFileName(owner_->absFileName())) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + tmpf.refresh(); + if (tmpf.isFileEmpty()) + return false; + + f = tmpf.absFileName(); + return true; +} + + +bool GIT::prepareFileRevisionEnabled() +{ + return true; +} + + +bool GIT::toggleReadOnlyEnabled() +{ + return true; +} + + } // namespace lyx