From: Pavel Sanda <sanda@lyx.org>
Date: Tue, 24 Nov 2009 22:17:55 +0000 (+0000)
Subject: VCS: allow displaying diff log
X-Git-Tag: 2.0.0~5029
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a5e4aea526a316561dc7ef02dd4b6914a1b37a3e;p=lyx.git

VCS: allow displaying diff log


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32180 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 70169e5b94..594bc68764 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -12,8 +12,11 @@
 
 #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"
@@ -725,9 +728,15 @@ string SVN::repoUpdate()
 				"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"), _("See &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();
 		}