From 4637d56284be035fb4ac9d6c5c1a24f4ab50d46f Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Thu, 18 Jun 2009 14:30:04 +0200
Subject: Don't ask to reload the file, if the user uses git/undo or
 git/revert.

Simply do it.

Task-Nr: 254558
---
 src/plugins/git/gitclient.cpp |  1 +
 src/plugins/git/gitplugin.cpp | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/plugins/git')

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index b32f4e4653d..74841b74b1b 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -42,6 +42,7 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/uniqueidmanager.h>
+#include <coreplugin/filemanager.h>
 #include <texteditor/itexteditor.h>
 #include <utils/qtcassert.h>
 #include <vcsbase/vcsbaseeditor.h>
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 0c8729cd252..595090085cb 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -553,7 +553,14 @@ void GitPlugin::undoFileChanges()
     QFileInfo fileInfo = currentFile();
     QString fileName = fileInfo.fileName();
     QString workingDirectory = fileInfo.absolutePath();
-    m_gitClient->checkout(workingDirectory, fileName);
+
+    Core::FileChangeBlocker fcb(fileInfo.filePath());
+    fcb.setModifiedReload(true);
+
+    QString errorMessage;
+    if (!m_gitClient->synchronousCheckout(workingDirectory, QStringList() << fileName, &errorMessage))
+        m_outputWindow->append(errorMessage);
+
 }
 
 void GitPlugin::undoProjectChanges()
@@ -583,6 +590,9 @@ void GitPlugin::unstageFile()
 void GitPlugin::revertFile()
 {
     const QFileInfo fileInfo = currentFile();
+    Core::FileChangeBlocker fcb(fileInfo.filePath());
+    fcb.setModifiedReload(true);
+
     m_gitClient->revert(QStringList(fileInfo.absoluteFilePath()));
 }
 
-- 
cgit v1.2.3