From 77fc7441af3228fc7b5fc97aa81849c43458f996 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 25 Sep 2009 12:41:13 +0200
Subject: [PATCH] Git: Remove dpulicate slot revert(), move to UndoFileChanges.
---
src/plugins/git/gitplugin.cpp | 19 ++-----------------
src/plugins/git/gitplugin.h | 1 -
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 9ca3e82c1f1..b0741ce867a 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -511,17 +511,11 @@ void GitPlugin::logProject()
void GitPlugin::undoFileChanges()
{
- QFileInfo fileInfo = currentFile();
- QString fileName = fileInfo.fileName();
- QString workingDirectory = fileInfo.absolutePath();
-
+ const QFileInfo fileInfo = currentFile();
Core::FileChangeBlocker fcb(fileInfo.filePath());
fcb.setModifiedReload(true);
- QString errorMessage;
- if (!m_gitClient->synchronousCheckout(workingDirectory, QStringList() << fileName, &errorMessage))
- VCSBase::VCSBaseOutputWindow::instance()->append(errorMessage);
-
+ m_gitClient->revert(QStringList(fileInfo.absoluteFilePath()));
}
void GitPlugin::undoProjectChanges()
@@ -556,15 +550,6 @@ void GitPlugin::unstageFile()
m_gitClient->synchronousReset(workingDirectory, QStringList(fileName));
}
-void GitPlugin::revertFile()
-{
- const QFileInfo fileInfo = currentFile();
- Core::FileChangeBlocker fcb(fileInfo.filePath());
- fcb.setModifiedReload(true);
-
- m_gitClient->revert(QStringList(fileInfo.absoluteFilePath()));
-}
-
void GitPlugin::startCommit()
{
if (VCSBase::VCSBaseSubmitEditor::raiseSubmitEditor())
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 2970b6f32c0..bf3eb3e28ff 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -115,7 +115,6 @@ private slots:
void undoProjectChanges();
void stageFile();
void unstageFile();
- void revertFile();
void showCommit();
void startCommit();
--
GitLab