#include "VCBackend.h"
#include "Buffer.h"
-#include "LyXFunc.h"
+#include "LyX.h"
#include "FuncRequest.h"
#include "frontends/alert.h"
return false;
}
+// FIXME This could be implemented with cache from scanMaster
+string RCS::revisionInfo(LyXVC::RevisionInfo const)
+{
+ return string();
+}
+
/////////////////////////////////////////////////////////////////////
//
return false;
}
+
+string CVS::revisionInfo(LyXVC::RevisionInfo const)
+{
+ return string();
+}
+
+
/////////////////////////////////////////////////////////////////////
//
// SVN
void SVN::scanMaster()
{
locker_.clear();
+ // vcstatus code is somewhat superflous, until we want
+ // to implement read-only toggle for svn.
vcstatus = NOLOCKING;
if (checkLockMode()) {
if (isLocked()) {
vcstatus = LOCKED;
} else {
locker_ = "Unlocked";
- vcstatus = LOCKED;
+ vcstatus = UNLOCKED;
}
}
}
bool SVN::isLocked() const
{
- //refresh file info
- FileName file(file_.absFilename());
- return !file.isReadOnly();
+ file_.refresh();
+ return !file_.isReadOnly();
}
frontend::Alert::error(_("Revision control error."),
_("Error when committing to repository.\n"
"You have to manually resolve the problem.\n"
- "After pressing OK, LyX will reopen the document."));
+ "LyX will reopen the document after you press OK."));
else
fileLock(false, tmpf, log);
while (ifs) {
getline(ifs, line);
- lyxerr << line << "\n";
- if (!line.empty()) status += line + "; ";
- if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
+ 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;
}
if (!locked_mode_ || (isLocked() == lock))
return;
- string arg = lock ? "lock " : "unlock ";
+ string const arg = lock ? "lock " : "unlock ";
doVCCommand("svn "+ arg + quoteName(onlyFilename(owner_->absFileName()))
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
return N_("Error: Could not generate logfile.");
}
- doVCCommand("svn update " + quoteName(onlyFilename(owner_->absFileName()))
+ doVCCommand("svn update --non-interactive " + quoteName(onlyFilename(owner_->absFileName()))
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
frontend::Alert::error(_("Revision control error."),
bformat(_("Error when updating from repository.\n"
"You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n"
- "After pressing OK, LyX will try to reopen resolved document."),
+ "After pressing OK, LyX will try to reopen the resolved document."),
from_local8bit(res)));
fileLock(true, tmpf, log);
// FileName(owner_->filePath()));
// res = "Revert log:\n" + tmpf.fileContents("UTF-8");
doVCCommand("svn update --accept mine-full " + quoteName(owner_->filePath())
- + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ + " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
res += "Update log:\n" + tmpf.fileContents("UTF-8");
}
+string SVN::revisionInfo(LyXVC::RevisionInfo const info)
+{
+ switch (info) {
+ case LyXVC::File:
+ if (rev_file_cache_.empty())
+ rev_file_cache_ = getFileRevisionInfo();
+ if (rev_file_cache_.empty())
+ rev_file_cache_ = "?";
+ if (rev_file_cache_ == "?")
+ return string();
+
+ return rev_file_cache_;
+ }
+ return string();
+}
+
+
+std::string SVN::getFileRevisionInfo()
+{
+ FileName tmpf = FileName::tempName("lyxvcout");
+
+ doVCCommand("svn info --xml " + quoteName(onlyFilename(owner_->absFileName()))
+ + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ FileName(owner_->filePath()));
+
+ if (tmpf.empty())
+ return string();
+
+ ifstream ifs(tmpf.toFilesystemEncoding().c_str());
+ string line;
+ // commit log part
+ bool c = false;
+ string rev;
+
+ while (ifs) {
+ getline(ifs, line);
+ LYXERR(Debug::LYXVC, line);
+ if (prefixIs(line, "<commit"))
+ c = true;
+ if (c && prefixIs(line, " revision=\"") && suffixIs(line, "\">")) {
+ string l1 = subst(line, "revision=\"", "");
+ string l2 = trim(subst(l1, "\">", ""));
+ if (isStrInt(l2))
+ rev = l2;
+ }
+ }
+ ifs.close();
+ tmpf.erase();
+ return rev;
+}
+
+
void SVN::getLog(FileName const & tmpf)
{
doVCCommand("svn log " + quoteName(onlyFilename(owner_->absFileName()))