From 0598202d3d61fc317e1cfb2dbae70e0bb380b8f9 Mon Sep 17 00:00:00 2001
From: Nikita Baryshnikov <nib952051@gmail.com>
Date: Fri, 15 Jul 2016 00:59:19 +0300
Subject: [PATCH] DiffEditor: do not show reload prompt

for text document, after reverting some change in diff editor

Change-Id: I3511f00e52beffba1cce67fb6940d1b580ef99cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/diffeditor/diffeditorwidgetcontroller.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
index b6404e086bc..8c4e182b229 100644
--- a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
@@ -27,8 +27,9 @@
 #include "diffeditorconstants.h"
 #include "diffeditordocument.h"
 
-#include <coreplugin/patchtool.h>
+#include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/patchtool.h>
 
 #include <texteditor/fontsettings.h>
 
@@ -92,6 +93,8 @@ void DiffEditorWidgetController::patch(bool revert)
     if (patch.isEmpty())
         return;
 
+    const QString absFileName = QFileInfo(workingDirectory + '/' + fileName).absoluteFilePath();
+    FileChangeBlocker fileChangeBlocker(absFileName);
     if (PatchTool::runPatch(EditorManager::defaultTextCodec()->fromUnicode(patch),
                             workingDirectory, strip, revert))
         m_document->reload();