#include "VCBackend.h"
#include "Buffer.h"
+#include "LyXFunc.h"
+#include "FuncRequest.h"
#include "frontends/alert.h"
+#include "frontends/Application.h"
#include "support/debug.h"
#include "support/filetools.h"
LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd);
Systemcall one;
support::PathChanger p(path);
- return one.startscript(Systemcall::Wait, cmd);
+ return one.startscript(Systemcall::Wait, cmd, false);
}
bool RCS::toggleReadOnlyEnabled()
{
- return true;
+ // This got broken somewhere along lfuns dispatch reorganization.
+ // reloadBuffer would be needed after this, but thats problematic
+ // since we are inside Buffer::dispatch.
+ // return true;
+ return false;
}
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();
}
fileLock(false, tmpf, log);
tmpf.erase();
- return "SVN: " + log;
+ return log.empty() ? string() : "SVN: " + log;
}
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()));
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);
tmpf.erase();
- return "SVN: " + log;
+ return log.empty() ? string() : "SVN: " + log;
}
"In case of file conflict version of the local directory files "
"will be preferred."
"\n\nContinue?"), file);
- int const ret = frontend::Alert::prompt(_("Changes detected"),
+ int ret = frontend::Alert::prompt(_("Changes detected"),
+ text, 0, 1, _("&Yes"), _("&No"), _("View &Log ..."));
+ if (ret == 2 ) {
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFilename()));
+ ret = frontend::Alert::prompt(_("Changes detected"),
text, 0, 1, _("&Yes"), _("&No"));
- if (ret) {
+ hideDialogs("file", 0);
+ }
+ if (ret == 1 ) {
tmpf.erase();
return string();
}