#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);
}
}
-string RCS::repoSynchro()
+string RCS::repoUpdate()
{
lyxerr << "Sorry, not implemented." << endl;
return string();
}
-bool RCS::repoSynchroEnabled()
+bool RCS::repoUpdateEnabled()
{
return 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;
}
}
-string CVS::repoSynchro()
+string CVS::repoUpdate()
{
lyxerr << "Sorry, not implemented." << endl;
return string();
}
-bool CVS::repoSynchroEnabled()
+bool CVS::repoUpdateEnabled()
{
return false;
}
fileLock(false, tmpf, log);
tmpf.erase();
- return "SVN: " + log;
+ return log.empty() ? string() : "SVN: " + log;
}
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
+ // Lock error messages go unfortunately on stderr and are unreachible this way.
ifstream ifs(tmpf.toFilesystemEncoding().c_str());
string line;
while (ifs) {
fileLock(true, tmpf, log);
tmpf.erase();
- return "SVN: " + log;
+ return log.empty() ? string() : "SVN: " + log;
}
}
-string SVN::repoSynchro()
+string SVN::repoUpdate()
{
FileName tmpf = FileName::tempName("lyxvcout");
if (tmpf.empty()) {
if (!res.empty()) {
LYXERR(Debug::LYXVC, "Diff detected:\n" << res);
docstring const file = from_utf8(owner_->filePath());
- docstring text = bformat(_("There were detected changes"
- "in the working directory.\n"
- "Synchronizing with repository will discard "
- "any uncommitted changes in the directory:\n%1$s"
+ docstring text = bformat(_("There were detected changes "
+ "in the working directory:\n%1$s\n\n"
+ "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();
}
}
- doVCCommand("svn revert -R " + quoteName(owner_->filePath())
- + " > " + quoteName(tmpf.toFilesystemEncoding()),
- FileName(owner_->filePath()));
- res = "Revert log:\n" + tmpf.fileContents("UTF-8");
- doVCCommand("svn update " + quoteName(owner_->filePath())
+ // Reverting looks too harsh, see bug #6255.
+ // doVCCommand("svn revert -R " + quoteName(owner_->filePath())
+ // + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ // FileName(owner_->filePath()));
+ // res = "Revert log:\n" + tmpf.fileContents("UTF-8");
+ doVCCommand("svn update --accept mine-full " + quoteName(owner_->filePath())
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
res += "Update log:\n" + tmpf.fileContents("UTF-8");
}
-bool SVN::repoSynchroEnabled()
+bool SVN::repoUpdateEnabled()
{
return true;
}