feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't ask to reload the file, if the user uses git/undo or git/revert.

Browse Source 
Simply do it.

Task-Nr: 254558
This commit is contained in:
dt
2009-06-18 14:30:04 +02:00
parent 69d04bc069
commit 4637d56284
6 changed files with 67 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/perforce/perforceplugin.cpp
View File

@@ -444,18 +444,9 @@ void PerforcePlugin::revertCurrentFile()
return;
}
Core::FileManager *fm = Core::ICore::instance()->fileManager();
QList<Core::IFile *> files = fm->managedFiles(fileName);
foreach (Core::IFile *file, files) {
fm->blockFileChange(file);
}
Core::FileChangeBlocker fcb(fileName);
fcb.setModifiedReload(true);
PerforceResponse result2 = runP4Cmd(QStringList() << QLatin1String("revert") << fileName, QStringList(), CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow);
Core::IFile::ReloadBehavior tempBehavior =
Core::IFile::ReloadAll;
foreach (Core::IFile *file, files) {
file->modified(&tempBehavior);
fm->unblockFileChange(file);
}
}
void PerforcePlugin::diffCurrentFile()