LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd);
Systemcall one;
support::PathChanger p(path);
- return one.startscript(Systemcall::Wait, cmd, false);
+ return one.startscript(Systemcall::Wait, cmd, string(), false);
}
}
+bool VCS::makeRCSRevision(string const &version, string &revis) const
+{
+ string rev = revis;
+
+ if (isStrInt(rev)) {
+ int back = convert<int>(rev);
+ // if positive use as the last number in the whole revision string
+ if (back > 0) {
+ string base;
+ rsplit(version, base , '.' );
+ rev = base + "." + rev;
+ }
+ if (back == 0)
+ rev = version;
+ // we care about the last number from revision string
+ // in case of backward indexing
+ if (back < 0) {
+ string cur, base;
+ cur = rsplit(version, base , '.' );
+ if (!isStrInt(cur))
+ return false;
+ int want = convert<int>(cur) + back;
+ if (want <= 0)
+ return false;
+
+ rev = base + "." + convert<string>(want);
+ }
+ }
+
+ revis = rev;
+ return true;
+}
+
+
/////////////////////////////////////////////////////////////////////
//
// RCS
return owner_ && !owner_->isReadonly();
}
+
bool RCS::isCheckInWithConfirmation()
{
- //FIXME diff
+ // FIXME one day common getDiff for all backends
+ // docstring diff;
+ // if (getDiff(file, diff) && diff.empty())
+ // return false;
+
+ FileName tmpf = FileName::tempName("lyxvcout");
+ if (tmpf.empty()) {
+ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+ return true;
+ }
+
+ doVCCommandCall("rcsdiff " + quoteName(owner_->absFileName())
+ + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ FileName(owner_->filePath()));
+
+ docstring diff = tmpf.fileContents("UTF-8");
+ tmpf.erase();
+
+ if (diff.empty())
+ return false;
+
return true;
}
}
-void RCS::revert()
+bool RCS::revert()
{
- doVCCommand("co -f -u" + version_ + " "
+ if (doVCCommand("co -f -u" + version_ + " "
+ quoteName(onlyFileName(owner_->absFileName())),
- FileName(owner_->filePath()));
+ FileName(owner_->filePath())))
+ return false;
// We ignore changes and just reload!
owner_->markClean();
+ return true;
}
return false;
}
+
string RCS::revisionInfo(LyXVC::RevisionInfo const info)
{
if (info == LyXVC::File)
return version_;
+ // fill the rest of the attributes for a single file
+ if (rev_date_cache_.empty())
+ if (!getRevisionInfo())
+ return string();
+
+ switch (info) {
+ case LyXVC::Author:
+ return rev_author_cache_;
+ case LyXVC::Date:
+ return rev_date_cache_;
+ case LyXVC::Time:
+ return rev_time_cache_;
+ default: ;
+ }
+
return string();
}
-bool RCS::prepareFileRevision(string const &revis, string & f)
+bool RCS::getRevisionInfo()
{
- string rev = revis;
+ FileName tmpf = FileName::tempName("lyxvcout");
+ if (tmpf.empty()) {
+ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+ return false;
+ }
+ doVCCommand("rlog -r " + quoteName(onlyFileName(owner_->absFileName()))
+ + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ FileName(owner_->filePath()));
- if (isStrInt(rev)) {
- int back = convert<int>(rev);
- // if positive use as the last number in the whole revision string
- if (back > 0) {
- string base;
- rsplit(version_, base , '.' );
- rev = base + "." + rev;
- }
- if (back == 0)
- rev = version_;
- // we care about the last number from revision string
- // in case of backward indexing
- if (back < 0) {
- string cur, base;
- cur = rsplit(version_, base , '.' );
- if (!isStrInt(cur))
- return false;
- int want = convert<int>(cur) + back;
- if (want <= 0)
- return false;
+ if (tmpf.empty())
+ return false;
- rev = base + "." + convert<string>(want);
+ ifstream ifs(tmpf.toFilesystemEncoding().c_str());
+ string line;
+
+ // we reached to the entry, i.e. after initial log message
+ bool entry=false;
+ // line with critical info, e.g:
+ //"date: 2011/07/02 11:02:54; author: sanda; state: Exp; lines: +17 -2"
+ string result;
+
+ while (ifs) {
+ getline(ifs, line);
+ LYXERR(Debug::LYXVC, line);
+ if (entry && prefixIs(line, "date:")) {
+ result = line;
+ break;
}
+ if (prefixIs(line, "revision"))
+ entry = true;
}
+ if (result.empty())
+ return false;
+
+ rev_date_cache_ = token(result, ' ', 1);
+ rev_time_cache_ = rtrim(token(result, ' ', 2), ";");
+ rev_author_cache_ = trim(token(token(result, ';', 1), ':', 1));
+
+ return !rev_author_cache_.empty();
+}
+
+bool RCS::prepareFileRevision(string const &revis, string & f)
+{
+ string rev = revis;
+ if (!VCS::makeRCSRevision(version_, rev))
+ return false;
FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_");
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
- return N_("Error: Could not generate logfile.");
+ return false;
}
doVCCommand("co -p" + rev + " "
docstring const file = from_utf8(owner_->filePath());
docstring text = bformat(_("There were detected changes "
"in the working directory:\n%1$s\n\n"
- "In case of file conflict you have to resolve them "
- "manually or revert to repository version later."), file);
+ "Possible file conflicts must be then resolved manually "
+ "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 ) {
}
-void CVS::revert()
+bool CVS::revert()
{
// Reverts to the version in CVS repository and
// gets the updated version from the repository.
switch (status) {
case UpToDate:
if (vcstatus != NOLOCKING)
- unedit();
+ return 0 == unedit();
break;
case NeedsMerge:
case NeedsCheckout:
bformat(_("The document %1$s is not in repository.\n"
"You have to check in the first revision before you can revert."),
file)) ;
- break;
+ return false;
}
default: {
docstring const file = owner_->fileName().displayName(20);
bformat(_("Cannot revert document %1$s to repository version.\n"
"The status '%2$s' is unexpected."),
file, toString(status)));
- break;
+ return false;
}
}
+ return true;
}
}
-bool CVS::prepareFileRevision(string const &, string &)
+bool CVS::prepareFileRevision(string const & revis, string & f)
{
- return false;
+ string rev = revis;
+ if (!VCS::makeRCSRevision(version_, rev))
+ return false;
+
+ FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_");
+ if (tmpf.empty()) {
+ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+ return false;
+ }
+
+ doVCCommandWithOutput("cvs update -p -r" + rev + " "
+ + getTarget(File),
+ FileName(owner_->filePath()), tmpf);
+ if (tmpf.isFileEmpty())
+ return false;
+
+ f = tmpf.absFileName();
+ return true;
}
bool CVS::prepareFileRevisionEnabled()
{
- return false;
+ return true;
}
FileName tmpf = FileName::tempName("lyxvcout");
if (tmpf.empty()){
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
- return N_("Error: Could not generate logfile.");
+ return false;
}
LYXERR(Debug::LYXVC, "Detecting locking mode...");
bool SVN::isCheckInWithConfirmation()
{
- //FIXME diff
+ // FIXME one day common getDiff and perhaps OpMode for all backends
+
+ FileName tmpf = FileName::tempName("lyxvcout");
+ if (tmpf.empty()) {
+ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+ return true;
+ }
+
+ doVCCommandCall("svn diff " + quoteName(owner_->absFileName())
+ + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ FileName(owner_->filePath()));
+
+ docstring diff = tmpf.fileContents("UTF-8");
+ tmpf.erase();
+
+ if (diff.empty())
+ return false;
+
return true;
}
}
-void SVN::revert()
+bool SVN::revert()
{
// Reverts to the version in SVN repository and
// gets the updated version from the repository.
string const fil = quoteName(onlyFileName(owner_->absFileName()));
- doVCCommand("svn revert -q " + fil,
- FileName(owner_->filePath()));
+ if (doVCCommand("svn revert -q " + fil,
+ FileName(owner_->filePath())))
+ return false;
owner_->markClean();
+ return true;
}
FileName tmpf = FileName::tempName("lyxvcout");
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
- return N_("Error: Could not generate logfile.");
+ return false;
}
doVCCommand("svn info --xml " + quoteName(onlyFileName(owner_->absFileName()))
FileName tmpf = FileName::tempName("lyxvcout");
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
- return N_("Error: Could not generate logfile.");
+ return false;
}
doVCCommand("svnversion -n . > " + quoteName(tmpf.toFilesystemEncoding()),
FileName tmpf = FileName::tempName("lyxvcrev_" + revname + "_");
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
- return N_("Error: Could not generate logfile.");
+ return false;
}
doVCCommand("svn cat -r " + revname + " "
projects / lyx.git / blobdiff