diff --git a/plugins/patchreview/patchreview.cpp b/plugins/patchreview/patchreview.cpp index 3575636a39..492522691e 100644 --- a/plugins/patchreview/patchreview.cpp +++ b/plugins/patchreview/patchreview.cpp @@ -1,1609 +1,1635 @@ /*************************************************************************** Copyright 2006-2009 David Nolden ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "patchreview.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "libdiff2/komparemodellist.h" #include "libdiff2/kompare.h" #include #include #include #include #include #include #include #include #include #include #include #include ///Whether arbitrary exceptions that occurred while diff-parsing within the library should be caught #define CATCHLIBDIFF /* Exclude this file from doublequote_chars check as krazy doesn't understand std::string*/ //krazy:excludeall=doublequote_chars #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "diffsettings.h" #include #include #include "standardpatchexport.h" #include using namespace KDevelop; namespace { // Maximum number of files to open directly within a tab when the review is started const int maximumFilesToOpenDirectly = 15; } Q_DECLARE_METATYPE( const Diff2::DiffModel* ) PatchReviewToolView::PatchReviewToolView( QWidget* parent, PatchReviewPlugin* plugin ) : QWidget( parent ), m_reversed( false ), m_plugin( plugin ) { connect( plugin, SIGNAL(patchChanged()), SLOT(patchChanged()) ); connect( ICore::self()->documentController(), SIGNAL(documentActivated(KDevelop::IDocument*)), this, SLOT(documentActivated(KDevelop::IDocument*)) ); showEditDialog(); patchChanged(); } void PatchReviewToolView::patchChanged() { fillEditFromPatch(); kompareModelChanged(); } PatchReviewToolView::~PatchReviewToolView() { } void PatchReviewToolView::updatePatchFromEdit() { IPatchSource::Ptr ips = m_plugin->patch(); if ( !ips ) return; LocalPatchSource* lpatch = dynamic_cast(ips.data()); if(!lpatch) return; lpatch->m_command = m_editPatch.command->text(); lpatch->m_filename = m_editPatch.filename->url(); lpatch->m_baseDir = m_editPatch.baseDir->url(); // lpatch->m_depth = m_editPatch.depth->value(); m_plugin->notifyPatchChanged(); } void PatchReviewToolView::fillEditFromPatch() { IPatchSource::Ptr ipatch = m_plugin->patch(); if ( !ipatch ) return ; disconnect( m_editPatch.patchSelection, SIGNAL(currentIndexChanged(int)), this, SLOT(patchSelectionChanged(int))); m_editPatch.patchSelection->clear(); foreach(IPatchSource::Ptr patch, m_plugin->knownPatches()) { if(!patch) continue; m_editPatch.patchSelection->addItem(patch->icon(), patch->name()); if(patch == ipatch) m_editPatch.patchSelection->setCurrentIndex(m_editPatch.patchSelection->count()-1); } connect( m_editPatch.patchSelection, SIGNAL(currentIndexChanged(int)), this, SLOT(patchSelectionChanged(int))); m_editPatch.cancelReview->setVisible(ipatch->canCancel()); QString finishText = i18n("Finish Review"); if(!ipatch->finishReviewCustomText().isEmpty()) finishText = ipatch->finishReviewCustomText(); kDebug() << "finish-text: " << finishText; m_editPatch.finishReview->setText(finishText); if(m_customWidget) { kDebug() << "removing custom widget"; m_customWidget->hide(); m_editPatch.verticalLayout->removeWidget(m_customWidget); } m_customWidget = ipatch->customWidget(); if(m_customWidget) { m_editPatch.verticalLayout->insertWidget(0, m_customWidget); m_customWidget->show(); kDebug() << "got custom widget"; } LocalPatchSource* lpatch = dynamic_cast(ipatch.data()); if(!lpatch) { m_editPatch.tabWidget->hide(); m_editPatch.baseDir->hide(); m_editPatch.label->hide(); return; }else{ m_editPatch.tabWidget->show(); m_editPatch.baseDir->show(); m_editPatch.label->show(); } m_editPatch.command->setText( lpatch->m_command ); m_editPatch.filename->setUrl( lpatch->m_filename ); m_editPatch.baseDir->setUrl( lpatch->m_baseDir ); // m_editPatch.depth->setValue( lpatch->m_depth ); if ( lpatch->m_command.isEmpty() ) m_editPatch.tabWidget->setCurrentIndex( m_editPatch.tabWidget->indexOf( m_editPatch.fileTab ) ); else m_editPatch.tabWidget->setCurrentIndex( m_editPatch.tabWidget->indexOf( m_editPatch.commandTab ) ); } void PatchReviewToolView::patchSelectionChanged(int selection) { m_editPatch.filesList->clear(); if(selection >= 0 && selection < m_plugin->knownPatches().size()) { m_plugin->setPatch(m_plugin->knownPatches()[selection]); } } void PatchReviewToolView::slotEditCommandChanged() { // m_editPatch.filename->lineEdit()->setText( "" ); updatePatchFromEdit(); } void PatchReviewToolView::slotEditFileNameChanged() { // m_editPatch.command->setText( "" ); updatePatchFromEdit(); } void PatchReviewToolView::showEditDialog() { m_editPatch.setupUi( this ); m_editPatch.filesList->header()->hide(); m_editPatch.filesList->setRootIsDecorated(false); m_editPatch.previousHunk->setIcon(KIcon("arrow-up")); m_editPatch.nextHunk->setIcon(KIcon("arrow-down")); m_editPatch.cancelReview->setIcon(KIcon("dialog-cancel")); m_editPatch.finishReview->setIcon(KIcon("dialog-ok")); QMenu* exportMenu = new QMenu(m_editPatch.exportReview); StandardPatchExport* stdactions = new StandardPatchExport(m_plugin, this); stdactions->addActions(exportMenu); connect(exportMenu, SIGNAL(triggered(QAction*)), m_plugin, SLOT(exporterSelected(QAction*))); IPluginController* pluginManager = ICore::self()->pluginController(); foreach( IPlugin* p, pluginManager->allPluginsForExtension( "org.kdevelop.IPatchExporter" ) ) { KPluginInfo info=pluginManager->pluginInfo(p); QAction* action=exportMenu->addAction(KIcon(info.icon()), info.name()); action->setData(qVariantFromValue(p)); } m_editPatch.exportReview->setMenu(exportMenu); connect( m_editPatch.previousHunk, SIGNAL( clicked( bool ) ), this, SLOT( prevHunk() ) ); connect( m_editPatch.nextHunk, SIGNAL( clicked( bool ) ), this, SLOT( nextHunk() ) ); connect( m_editPatch.filesList, SIGNAL( doubleClicked( const QModelIndex& ) ), this, SLOT( fileDoubleClicked( const QModelIndex& ) ) ); connect( m_editPatch.cancelReview, SIGNAL(clicked(bool)), m_plugin, SLOT(cancelReview()) ); connect( m_editPatch.finishReview, SIGNAL(clicked(bool)), this, SLOT(finishReview()) ); //connect( m_editPatch.cancelButton, SIGNAL( pressed() ), this, SLOT( slotEditCancel() ) ); //connect( this, SIGNAL( finished( int ) ), this, SLOT( slotEditDialogFinished( int ) ) ); // connect( m_editPatch.depth, SIGNAL(valueChanged(int)), SLOT(updatePatchFromEdit()) ); connect( m_editPatch.filename, SIGNAL( textChanged( const QString& ) ), SLOT(slotEditFileNameChanged()) ); connect( m_editPatch.baseDir, SIGNAL(textChanged(QString)), SLOT(updatePatchFromEdit()) ); m_editPatch.baseDir->setMode(KFile::Directory); connect( m_editPatch.command, SIGNAL( textChanged( const QString& ) ), this, SLOT(slotEditCommandChanged()) ); // connect( m_editPatch.commandToFile, SIGNAL( clicked( bool ) ), this, SLOT( slotToFile() ) ); connect( m_editPatch.filename->lineEdit(), SIGNAL( returnPressed() ), this, SLOT(slotEditFileNameChanged()) ); connect( m_editPatch.filename->lineEdit(), SIGNAL( editingFinished() ), this, SLOT(slotEditFileNameChanged()) ); connect( m_editPatch.filename, SIGNAL( urlSelected( const KUrl& ) ), this, SLOT(slotEditFileNameChanged()) ); connect( m_editPatch.command, SIGNAL(textChanged(QString)), this, SLOT(slotEditCommandChanged()) ); // connect( m_editPatch.commandToFile, SIGNAL(clicked(bool)), m_plugin, SLOT(commandToFile()) ); connect( m_editPatch.patchSelection, SIGNAL(currentIndexChanged(int)), this, SLOT(patchSelectionChanged(int))); connect( m_editPatch.updateButton, SIGNAL(clicked(bool)), m_plugin, SLOT(forceUpdate()) ); connect( m_editPatch.showButton, SIGNAL(clicked(bool)), m_plugin, SLOT(showPatch()) ); bool blocked = blockSignals( true ); blockSignals( blocked ); } void PatchReviewToolView::nextHunk() { // updateKompareModel(); m_plugin->seekHunk( true ); } void PatchReviewToolView::prevHunk() { // updateKompareModel(); m_plugin->seekHunk( false ); } KUrl PatchReviewPlugin::diffFile() { return m_patch->file(); } void PatchReviewPlugin::seekHunk( bool forwards, const KUrl& fileName ) { try { if ( !m_modelList.get() ) throw "no model"; for (int a = 0; a < m_modelList->modelCount(); ++a) { const Diff2::DiffModel* model = m_modelList->modelAt(a); if ( !model || !model->differences() ) continue; KUrl file = m_patch->baseDir(); file.addPath( model->destinationPath() ); file.addPath( model->destinationFile() ); if ( !fileName.isEmpty() && fileName != file ) continue; IDocument* doc = ICore::self()->documentController()->documentForUrl( file ); if ( doc && doc == ICore::self()->documentController()->activeDocument() && m_highlighters.contains(doc->url()) && m_highlighters[doc->url()] ) { ICore::self()->documentController()->activateDocument( doc ); if ( doc->textDocument() ) { KTextEditor::MovingInterface* moving = dynamic_cast( doc->textDocument() ); Q_ASSERT(moving); const QList< KTextEditor::MovingRange* > ranges = m_highlighters[doc->url()]->ranges(); KTextEditor::View * v = doc->textDocument() ->activeView(); int bestLine = -1; if ( v ) { KTextEditor::Cursor c = v->cursorPosition(); for ( QList< KTextEditor::MovingRange* >::const_iterator it = ranges.begin(); it != ranges.end(); ++it ) { int line; line = (*it)->start().line(); if ( forwards ) { if ( line > c.line() && ( bestLine == -1 || line < bestLine ) ) bestLine = line; } else { if ( line < c.line() && ( bestLine == -1 || line > bestLine ) ) bestLine = line; } } if ( bestLine != -1 ) { v->setCursorPosition( KTextEditor::Cursor( bestLine, 0 ) ); return ; } } } } } } catch ( const QString & str ) { kDebug() << "seekHunk():" << str; } catch ( const char * str ) { kDebug() << "seekHunk():" << str; } kDebug() << "no matching hunk found"; } void PatchReviewPlugin::addHighlighting(const KUrl& highlightFile, IDocument* document) { try { if ( !modelList() ) throw "no model"; for (int a = 0; a < modelList()->modelCount(); ++a) { const Diff2::DiffModel* model = modelList()->modelAt(a); if ( !model ) continue; KUrl file = m_patch->baseDir(); file.addPath( model->destinationPath() ); file.addPath( model->destinationFile() ); if (file != highlightFile) continue; kDebug() << "highlighting" << file.prettyUrl(); IDocument* doc = document; if(!doc) doc = ICore::self()->documentController()->documentForUrl( file ); kDebug() << "highlighting file" << file << "with doc" << doc; if ( !doc || !doc->textDocument() ) continue; removeHighlighting( file ); m_highlighters[ file ] = new PatchHighlighter( model, doc, this ); } } catch ( const QString & str ) { kDebug() << "highlightFile():" << str; } catch ( const char * str ) { kDebug() << "highlightFile():" << str; } } void PatchReviewPlugin::highlightPatch() { try { if ( !modelList() ) throw "no model"; for (int a = 0; a < modelList()->modelCount(); ++a) { const Diff2::DiffModel* model = modelList()->modelAt(a); if ( !model ) continue; KUrl file = m_patch->baseDir(); file.addPath( model->destinationPath() ); file.addPath( model->destinationFile() ); addHighlighting(file); } } catch ( const QString & str ) { kDebug() << "highlightFile():" << str; } catch ( const char * str ) { kDebug() << "highlightFile():" << str; } } void PatchReviewToolView::finishReview() { QList selectedUrls; for(int a = 0; a< m_editPatch.filesList->topLevelItemCount(); ++a) { QTreeWidgetItem* item = m_editPatch.filesList->topLevelItem(a); if(item && item->checkState(0) == Qt::Checked) { QVariant v = item->data(0, Qt::UserRole); if( v.canConvert() ) { selectedUrls << v.value(); }else if ( v.canConvert() ) { const Diff2::DiffModel* model = v.value(); KUrl file = m_plugin->patch()->baseDir(); file.addPath( model->destinationPath() ); file.addPath( model->destinationFile() ); selectedUrls << file; } } } kDebug() << "finishing review with" << selectedUrls; m_plugin->finishReview(selectedUrls); } void PatchReviewToolView::fileDoubleClicked( const QModelIndex& i ) { try { if ( !m_plugin->modelList() ) throw "no model"; QVariant v = i.data( Qt::UserRole ); if( v.canConvert() ) { KUrl u = v.value(); ICore::self()->documentController()->openDocument( u, KTextEditor::Cursor() ); return; } if ( !v.canConvert() ) throw "cannot convert"; const Diff2::DiffModel* model = v.value(); if ( !model ) throw "bad model-value"; KUrl file = m_plugin->patch()->baseDir(); file.addPath( model->destinationPath() ); file.addPath( model->destinationFile() ); kDebug() << "opening" << file.toLocalFile(); ICore::self()->documentController()->openDocument( file, KTextEditor::Cursor() ); m_plugin->seekHunk( true, file ); } catch ( const QString & str ) { kDebug() << "fileDoubleClicked():" << str; } catch ( const char * str ) { kDebug() << "fileDoubleClicked():" << str; } } KUrl PatchReviewToolView::urlForFileModel(const Diff2::DiffModel* model) { KUrl file = m_plugin->patch()->baseDir(); file.addPath( model->destinationPath() ); file.addPath( model->destinationFile() ); return file; } static QString stateToString(KDevelop::VcsStatusInfo::State state) { switch(state) { case KDevelop::VcsStatusInfo::ItemAdded: return i18nc("VCS file status", "Added"); case KDevelop::VcsStatusInfo::ItemDeleted: return i18nc("VCS file status", "Deleted"); case KDevelop::VcsStatusInfo::ItemHasConflicts: return i18nc("VCS file status", "Has Conflicts"); case KDevelop::VcsStatusInfo::ItemModified: return i18nc("VCS file status", "Modified"); case KDevelop::VcsStatusInfo::ItemUpToDate: return i18nc("VCS file status", "Up To Date"); case KDevelop::VcsStatusInfo::ItemUnknown: case KDevelop::VcsStatusInfo::ItemUserState: return i18nc("VCS file status", "Unknown"); } return i18nc("Unknown VCS file status, probably a backend error", "?"); } static KIcon stateToIcon(KDevelop::VcsStatusInfo::State state) { switch(state) { case KDevelop::VcsStatusInfo::ItemAdded: return KIcon("vcs-added"); case KDevelop::VcsStatusInfo::ItemDeleted: return KIcon("vcs-removed"); case KDevelop::VcsStatusInfo::ItemHasConflicts: return KIcon("vcs-conflicting"); case KDevelop::VcsStatusInfo::ItemModified: return KIcon("vcs-locally-modified"); case KDevelop::VcsStatusInfo::ItemUpToDate: return KIcon("vcs-normal"); case KDevelop::VcsStatusInfo::ItemUnknown: case KDevelop::VcsStatusInfo::ItemUserState: return KIcon("unknown"); } return KIcon("dialog-error"); } void PatchReviewToolView::kompareModelChanged() { m_editPatch.filesList->clear(); m_editPatch.filesList->setColumnCount(1); if (!m_plugin->modelList()) return; QMap additionalUrls = m_plugin->patch()->additionalSelectableFiles(); QSet haveUrls; const Diff2::DiffModelList* models = m_plugin->modelList()->models(); if( models ) { Diff2::DiffModelList::const_iterator it = models->constBegin(); for(; it != models->constEnd(); ++it) { Diff2::DifferenceList * diffs = ( *it ) ->differences(); int cnt = 0; if ( diffs ) cnt = diffs->count(); KUrl file = urlForFileModel(*it); haveUrls.insert(file); if(!QFileInfo(file.toLocalFile()).isReadable()) continue; QTreeWidgetItem* item = new QTreeWidgetItem(m_editPatch.filesList); m_editPatch.filesList->insertTopLevelItem(0, item); const QString filenameArgument = ICore::self()->projectController()->prettyFileName(file, KDevelop::IProjectController::FormatPlain); QString text; QIcon icon; if(additionalUrls.contains(file)) { text = i18ncp("%1: number of changed hunks, %2: file name, %3: vcs file state", "%2 (1 hunk, %3)", "%2 (%1 hunks, %3)", cnt, filenameArgument, stateToString(additionalUrls[file])); icon = stateToIcon(additionalUrls[file]); } else { text = i18ncp("%1: number of changed hunks, %2: file name", "%2 (1 hunk)", "%2 (%1 hunks)", cnt, filenameArgument); } item->setData( 0, Qt::DisplayRole, text ); item->setIcon( 0, icon ); item->setData( 0, Qt::UserRole, qVariantFromValue(*it)); item->setCheckState( 0, Qt::Checked ); } } // Maps the _really_ useful items (with VCS state) to index 0, // the items that have at least a project found to 1, // and the probably really useless items without project found to 2. // The project-manager filters useless stuff like backups out so they get index 2. QMap > > newItems; for(QMap::const_iterator it = additionalUrls.constBegin(); it != additionalUrls.constEnd(); ++it) { KUrl url = it.key(); if(!haveUrls.contains(url)) { haveUrls.insert(url); if(*it != KDevelop::VcsStatusInfo::ItemUnknown) { newItems[0] << qMakePair(url, *it); }else{ if(((bool)ICore::self()->projectController()->findProjectForUrl(url))) { newItems[1] << qMakePair(url, *it); }else{ newItems[2] << qMakePair(url, *it); } } } } for(int a = 0; a < 3; ++a) { for(QList< QPair< KUrl, KDevelop::VcsStatusInfo::State > >::iterator itemIt = newItems[a].begin(); itemIt != newItems[a].end(); ++itemIt) { KUrl url = itemIt->first; KDevelop::VcsStatusInfo::State state = itemIt->second; QTreeWidgetItem* item = new QTreeWidgetItem(m_editPatch.filesList); QString text = ICore::self()->projectController()->prettyFileName(url, KDevelop::IProjectController::FormatPlain); text += " (" + stateToString(state) + ")"; item->setData( 0, Qt::DisplayRole, text ); QVariant v; v.setValue( url ); item->setData( 0, Qt::UserRole, v ); item->setIcon( 0, stateToIcon(state) ); item->setCheckState( 0, Qt::Unchecked ); if(a == 0) item->setCheckState( 0, Qt::Checked ); m_editPatch.filesList->addTopLevelItem(item); } } } void PatchReviewToolView::documentActivated(IDocument* doc) { QModelIndexList i = m_editPatch.filesList->selectionModel() ->selectedIndexes(); if ( !m_plugin->modelList() ) return ; for(int a = 0; a < m_editPatch.filesList->topLevelItemCount(); ++a) { QTreeWidgetItem* item = m_editPatch.filesList->topLevelItem(a); QVariant v = item->data( 0, Qt::UserRole ); if ( v.canConvert() ) { const Diff2::DiffModel * model = v.value(); KUrl file = urlForFileModel(model); if(file == doc->url()) { m_editPatch.filesList->setCurrentItem(item); return; } } } m_editPatch.filesList->setCurrentIndex(QModelIndex()); } void PatchHighlighter::aboutToDeleteMovingInterfaceContent(KTextEditor::Document* ) { kDebug() << "about to delete"; clear(); } QSize sizeHintForHtml(QString html, QSize maxSize) { QTextDocument doc; doc.setHtml(html); QSize ret; if(doc.idealWidth() > maxSize.width()) { doc.setPageSize( QSize(maxSize.width(), 30) ); ret.setWidth(maxSize.width()); }else{ ret.setWidth(doc.idealWidth()); } ret.setHeight(doc.size().height()); if(ret.height() > maxSize.height()) ret.setHeight(maxSize.height()); return ret; } namespace { QPointer currentTooltip; KTextEditor::MovingRange* currentTooltipMark; } void PatchHighlighter::showToolTipForMark(QPoint pos, KTextEditor::MovingRange* markRange, QPair< int, int > highlightMark) { if(currentTooltipMark == markRange && currentTooltip) return; delete currentTooltip; //Got the difference Diff2::Difference* diff = m_differencesForRanges[markRange]; QString html; #if 0 if(diff->hasConflict()) html += i18n("Conflict
"); #endif Diff2::DifferenceStringList lines; if(m_plugin->patch()->isAlreadyApplied() && !diff->applied()) html += i18n("Reverted.
"); else if(!m_plugin->patch()->isAlreadyApplied() && diff->applied()) html += i18n("Applied.
"); if(diff->applied()) { if(isInsertion(diff)) { html += i18n("Insertion
"); }else{ if(isRemoval(diff)) html += i18n("Removal
"); html += i18n("Previous:
"); lines = diff->sourceLines(); } }else{ if(isRemoval(diff)) { html += i18n("Removal
"); }else{ if(isInsertion(diff)) html += i18n("Insertion
"); html += i18n("Alternative:
"); lines = diff->destinationLines(); } } for(int a = 0; a < lines.size(); ++a) { Diff2::DifferenceString* line = lines[a]; uint currentPos = 0; QString string = line->string(); Diff2::MarkerList markers = line->markerList(); for(int b = 0; b < markers.size(); ++b) { QString spanText = Qt::escape(string.mid(currentPos, markers[b]->offset() - currentPos)); if(markers[b]->type() == Diff2::Marker::End && (currentPos != 0 || markers[b]->offset() != string.size())) { if(a == highlightMark.first && b == highlightMark.second) html += "" + spanText + ""; else html += "" + spanText + ""; }else{ html += spanText; } currentPos = markers[b]->offset(); } html += Qt::escape(string.mid(currentPos, string.length()-currentPos)); html += "
"; } KTextBrowser* browser = new KTextBrowser; browser->setPalette( QApplication::palette() ); browser->setHtml(html); int maxHeight = 500; browser->setMinimumSize(sizeHintForHtml(html, QSize((ICore::self()->uiController()->activeMainWindow()->width()*2)/3, maxHeight))); browser->setMaximumSize(browser->minimumSize() + QSize(10, 10)); if(browser->minimumHeight() != maxHeight) browser->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); QVBoxLayout* layout = new QVBoxLayout; layout->setMargin(0); layout->addWidget(browser); KDevelop::ActiveToolTip* tooltip = new KDevelop::ActiveToolTip(ICore::self()->uiController()->activeMainWindow(), pos + QPoint(5, -browser->sizeHint().height() - 30)); tooltip->setLayout(layout); tooltip->resize( tooltip->sizeHint() + QSize(10, 10) ); tooltip->move(pos - QPoint(0, 20 + tooltip->height())); tooltip->addExtendRect(QRect(pos - QPoint(15, 15), pos + QPoint(15, 15))); currentTooltip = tooltip; currentTooltipMark = markRange; ActiveToolTip::showToolTip(tooltip); } void PatchHighlighter::markClicked(KTextEditor::Document* doc, KTextEditor::Mark mark, bool& handled) { if(handled) return; handled = true; if(doc->activeView()) ///This is a workaround, if the cursor is somewhere else, the editor will always jump there when a mark was clicked doc->activeView()->setCursorPosition(KTextEditor::Cursor(mark.line, 0)); KTextEditor::MovingRange* range = rangeForMark(mark); if(range) { KTextEditor::MovingInterface* moving = dynamic_cast( doc ); Q_ASSERT(moving); QString currentText = doc->text(range->toRange()); Diff2::Difference* diff = m_differencesForRanges[range]; removeLineMarker(range, diff); QString sourceText; QString targetText; for(int a = 0; a < diff->sourceLineCount(); ++a) { sourceText += diff->sourceLineAt(a)->string(); if(!sourceText.endsWith("\n")) sourceText += "\n"; } for(int a = 0; a < diff->destinationLineCount(); ++a) { targetText += diff->destinationLineAt(a)->string(); if(!targetText.endsWith("\n")) targetText += "\n"; } QString replace; QString replaceWith; if(!diff->applied()) { replace = sourceText; replaceWith = targetText; }else { replace = targetText; replaceWith = sourceText; } if(currentText.simplified() != replace.simplified()) { KMessageBox::error(ICore::self()->uiController()->activeMainWindow(), i18n("Could not apply the change: Text should be \"%1\", but is \"%2\".", replace, currentText)); return; } diff->apply(!diff->applied()); KTextEditor::Cursor start = range->start().toCursor(); range->document()->replaceText(range->toRange(), replaceWith); KTextEditor::Range newRange(start, start); uint replaceWithLines = replaceWith.count('\n'); newRange.end().setLine(newRange.end().line() + replaceWithLines); range->setRange(newRange); addLineMarker(range, diff); } { // After applying the change, show the tooltip again, mainly to update an old tooltip delete currentTooltip; bool h = false; markToolTipRequested(doc, mark, QCursor::pos(), h); } } KTextEditor::MovingRange* PatchHighlighter::rangeForMark(KTextEditor::Mark mark) { for(QMap< KTextEditor::MovingRange*, Diff2::Difference* >::const_iterator it = m_differencesForRanges.constBegin(); it != m_differencesForRanges.constEnd(); ++it) { if(it.key()->start().line() == mark.line) { return it.key(); } } return 0; } void PatchHighlighter::markToolTipRequested(KTextEditor::Document* , KTextEditor::Mark mark, QPoint pos, bool& handled) { if(handled) return; handled = true; int myMarksPattern = KTextEditor::MarkInterface::markType22 | KTextEditor::MarkInterface::markType23 | KTextEditor::MarkInterface::markType24 | KTextEditor::MarkInterface::markType25 | KTextEditor::MarkInterface::markType26 | KTextEditor::MarkInterface::markType27; if(mark.type & myMarksPattern) { //There is a mark in this line. Show the old text. KTextEditor::MovingRange* range = rangeForMark(mark); if(range) showToolTipForMark(pos, range); } } bool PatchHighlighter::isInsertion(Diff2::Difference* diff) { return diff->sourceLineCount() == 0; } bool PatchHighlighter::isRemoval(Diff2::Difference* diff) { return diff->destinationLineCount() == 0; } void PatchHighlighter::textInserted(KTextEditor::Document* doc, KTextEditor::Range range) { if(range == doc->documentRange()) { kDebug() << "re-doing"; //The document was loaded / reloaded if ( !m_model->differences() ) return ; KTextEditor::MovingInterface* moving = dynamic_cast( doc ); if ( !moving ) return; KTextEditor::MarkInterface* markIface = dynamic_cast( doc ); if( !markIface ) return; clear(); QColor activeIconColor = QApplication::palette().color(QPalette::Active, QPalette::Highlight); QColor inActiveIconColor = QApplication::palette().color(QPalette::Active, QPalette::Base); KColorScheme scheme(QPalette::Active); QImage tintedInsertion = KIcon("insert-text").pixmap(16, 16).toImage(); KIconEffect::colorize(tintedInsertion, scheme.foreground(KColorScheme::NegativeText).color(), 1.0); QImage tintedRemoval = KIcon("edit-delete").pixmap(16, 16).toImage(); KIconEffect::colorize(tintedRemoval, scheme.foreground(KColorScheme::NegativeText).color(), 1.0); QImage tintedChange = KIcon("text-field").pixmap(16, 16).toImage(); KIconEffect::colorize(tintedChange, scheme.foreground(KColorScheme::NegativeText).color(), 1.0); markIface->setMarkDescription(KTextEditor::MarkInterface::markType22, i18n("Insertion")); markIface->setMarkPixmap(KTextEditor::MarkInterface::markType22, QPixmap::fromImage(tintedInsertion)); markIface->setMarkDescription(KTextEditor::MarkInterface::markType23, i18n("Removal")); markIface->setMarkPixmap(KTextEditor::MarkInterface::markType23, QPixmap::fromImage(tintedRemoval)); markIface->setMarkDescription(KTextEditor::MarkInterface::markType24, i18n("Change")); markIface->setMarkPixmap(KTextEditor::MarkInterface::markType24, QPixmap::fromImage(tintedChange)); markIface->setMarkDescription(KTextEditor::MarkInterface::markType25, i18n("Insertion")); markIface->setMarkPixmap(KTextEditor::MarkInterface::markType25, KIcon("insert-text").pixmap(16, 16)); markIface->setMarkDescription(KTextEditor::MarkInterface::markType26, i18n("Removal")); markIface->setMarkPixmap(KTextEditor::MarkInterface::markType26, KIcon("edit-delete").pixmap(16, 16)); markIface->setMarkDescription(KTextEditor::MarkInterface::markType27, i18n("Change")); markIface->setMarkPixmap(KTextEditor::MarkInterface::markType27, KIcon("text-field").pixmap(16, 16)); for ( Diff2::DifferenceList::const_iterator it = m_model->differences() ->constBegin(); it != m_model->differences() ->constEnd(); ++it ) { Diff2::Difference* diff = *it; int line, lineCount; Diff2::DifferenceStringList lines ; if(diff->applied()) { line = diff->destinationLineNumber(); lineCount = diff->destinationLineCount(); lines = diff->destinationLines(); } else { line = diff->sourceLineNumber(); lineCount = diff->sourceLineCount(); lines = diff->sourceLines(); } if ( line > 0 ) line -= 1; KTextEditor::Cursor c( line, 0 ); KTextEditor::Cursor endC( line + lineCount, 0 ); if ( doc->lines() <= c.line() ) c.setLine( doc->lines() - 1 ); if ( doc->lines() <= endC.line() ) endC.setLine( doc->lines() ); if ( endC.isValid() && c.isValid() ) { KTextEditor::MovingRange * r = moving->newMovingRange( KTextEditor::Range(c, endC) ); m_ranges << r; m_differencesForRanges[r] = *it; addLineMarker(r, diff); } } } } PatchHighlighter::PatchHighlighter( const Diff2::DiffModel* model, IDocument* kdoc, PatchReviewPlugin* plugin ) throw( QString ) : m_doc( kdoc ), m_plugin(plugin), m_model(model) { // connect( kdoc, SIGNAL( destroyed( QObject* ) ), this, SLOT( documentDestroyed() ) ); connect( kdoc->textDocument(), SIGNAL(textInserted(KTextEditor::Document*,KTextEditor::Range)), this, SLOT(textInserted(KTextEditor::Document*,KTextEditor::Range)) ); connect( kdoc->textDocument(), SIGNAL( destroyed( QObject* ) ), this, SLOT( documentDestroyed() ) ); KTextEditor::Document* doc = kdoc->textDocument(); if ( doc->lines() == 0 ) return ; connect(doc, SIGNAL(markToolTipRequested(KTextEditor::Document*,KTextEditor::Mark,QPoint,bool&)), this, SLOT(markToolTipRequested(KTextEditor::Document*,KTextEditor::Mark,QPoint,bool&))); connect(doc, SIGNAL(markClicked(KTextEditor::Document*,KTextEditor::Mark,bool&)), this, SLOT(markClicked(KTextEditor::Document*,KTextEditor::Mark,bool&))); connect(doc, SIGNAL(aboutToDeleteMovingInterfaceContent (KTextEditor::Document*)), this, SLOT(aboutToDeleteMovingInterfaceContent(KTextEditor::Document*))); textInserted(kdoc->textDocument(), kdoc->textDocument()->documentRange()); } void PatchHighlighter::removeLineMarker(KTextEditor::MovingRange* range, Diff2::Difference* difference) { KTextEditor::MovingInterface* moving = dynamic_cast( range->document() ); if ( !moving ) return; KTextEditor::MarkInterface* markIface = dynamic_cast( range->document() ); if( !markIface ) return; markIface->removeMark(range->start().line(), KTextEditor::MarkInterface::markType22); markIface->removeMark(range->start().line(), KTextEditor::MarkInterface::markType23); markIface->removeMark(range->start().line(), KTextEditor::MarkInterface::markType24); markIface->removeMark(range->start().line(), KTextEditor::MarkInterface::markType25); markIface->removeMark(range->start().line(), KTextEditor::MarkInterface::markType26); markIface->removeMark(range->start().line(), KTextEditor::MarkInterface::markType27); // Remove all ranges that are in the same line (the line markers) foreach(KTextEditor::MovingRange* r, m_ranges) { if(r != range && range->contains(r->toRange())) { delete r; m_ranges.remove(r); } } } void PatchHighlighter::addLineMarker(KTextEditor::MovingRange* range, Diff2::Difference* diff) { KTextEditor::MovingInterface* moving = dynamic_cast( range->document() ); if ( !moving ) return; KTextEditor::MarkInterface* markIface = dynamic_cast( range->document() ); if( !markIface ) return; KSharedPtr t( new KTextEditor::Attribute() ); bool isOriginalState = diff->applied() == m_plugin->patch()->isAlreadyApplied(); if(isOriginalState) { t->setProperty( QTextFormat::BackgroundBrush, QBrush( ColorCache::self()->blendBackground( QColor( 0, 255, 255), 20 ) ) ); }else{ t->setProperty( QTextFormat::BackgroundBrush, QBrush( ColorCache::self()->blendBackground( QColor( 255, 0, 255), 20 ) ) ); } range->setAttribute( t ); range->setZDepth( -500 ); KTextEditor::MarkInterface::MarkTypes mark; if(isOriginalState) { mark = KTextEditor::MarkInterface::markType27; if(isInsertion(diff)) mark = KTextEditor::MarkInterface::markType25; if(isRemoval(diff)) mark = KTextEditor::MarkInterface::markType26; }else{ mark = KTextEditor::MarkInterface::markType24; if(isInsertion(diff)) mark = KTextEditor::MarkInterface::markType22; if(isRemoval(diff)) mark = KTextEditor::MarkInterface::markType23; } markIface->addMark(range->start().line(), mark); Diff2::DifferenceStringList lines; if(diff->applied()) lines = diff->destinationLines(); else lines = diff->sourceLines(); for(int a = 0; a < lines.size(); ++a) { Diff2::DifferenceString* line = lines[a]; int currentPos = 0; QString string = line->string(); Diff2::MarkerList markers = line->markerList(); for(int b = 0; b < markers.size(); ++b) { if(markers[b]->type() == Diff2::Marker::End) { if(currentPos != 0 || markers[b]->offset() != string.size()) { KTextEditor::MovingRange * r2 = moving->newMovingRange( KTextEditor::Range( KTextEditor::Cursor(a + range->start().line(), currentPos), KTextEditor::Cursor(a + range->start().line(), markers[b]->offset()) ) ); m_ranges << r2; KSharedPtr t( new KTextEditor::Attribute() ); t->setProperty( QTextFormat::BackgroundBrush, QBrush( ColorCache::self()->blendBackground( QColor( 255, 0, 0), 70 ) ) ); r2->setAttribute( t ); r2->setZDepth( -600 ); } } currentPos = markers[b]->offset(); } } } void PatchHighlighter::clear() { if(m_ranges.empty()) return; KTextEditor::MovingInterface* moving = dynamic_cast( m_doc->textDocument() ); if ( !moving ) return; KTextEditor::MarkInterface* markIface = dynamic_cast( m_doc->textDocument() ); if( !markIface ) return; QHash< int, KTextEditor::Mark* > marks = markIface->marks(); foreach(int line, marks.keys()) { markIface->removeMark(line, KTextEditor::MarkInterface::markType22); markIface->removeMark(line, KTextEditor::MarkInterface::markType23); markIface->removeMark(line, KTextEditor::MarkInterface::markType24); markIface->removeMark(line, KTextEditor::MarkInterface::markType25); markIface->removeMark(line, KTextEditor::MarkInterface::markType26); markIface->removeMark(line, KTextEditor::MarkInterface::markType27); } qDeleteAll(m_ranges); m_ranges.clear(); m_differencesForRanges.clear(); } PatchHighlighter::~PatchHighlighter() { clear(); } IDocument* PatchHighlighter::doc() { return m_doc; } void PatchHighlighter::documentDestroyed() { kDebug() << "document destroyed"; m_ranges.clear(); m_differencesForRanges.clear(); } void PatchReviewPlugin::removeHighlighting( const KUrl& file ) { if ( file.isEmpty() ) { ///Remove all highlighting qDeleteAll(m_highlighters); m_highlighters.clear(); } else { HighlightMap::iterator it = m_highlighters.find( file ); if ( it != m_highlighters.end() ) { delete * it; m_highlighters.erase( it ); } } } void PatchReviewPlugin::notifyPatchChanged() { kDebug() << "notifying patch change: " << m_patch->file(); m_updateKompareTimer->start(500); } void PatchReviewPlugin::showPatch() { startReview(m_patch, OpenAndRaise); } void PatchReviewPlugin::forceUpdate() { m_patch->update(); notifyPatchChanged(); } void PatchReviewPlugin::updateKompareModel() { kDebug() << "updating model"; try { removeHighlighting(); m_modelList.reset( 0 ); delete m_diffSettings; emit patchChanged(); if ( m_patch->file().isEmpty() ) return; qRegisterMetaType( "const Diff2::DiffModel*" ); m_diffSettings = new DiffSettings( 0 ); m_kompareInfo.reset( new Kompare::Info() ); m_kompareInfo->localDestination=m_patch->file().toLocalFile(); m_kompareInfo->localSource=m_patch->baseDir().toLocalFile(); m_modelList.reset(new Diff2::KompareModelList( m_diffSettings.data(), new QWidget, this )); m_modelList->slotKompareInfo(m_kompareInfo.get()); try { if ( !m_modelList->openDirAndDiff() ) { #if 0 // Don't error out on empty files, as those are valid diffs too if(QFileInfo(m_patch->file().toLocalFile()).size() != 0) throw "could not open diff " + m_patch->file().prettyUrl() + " on " + m_patch->baseDir().prettyUrl(); #endif } } catch ( const QString & str ) { throw; } catch ( ... ) { throw QString( "lib/libdiff2 crashed, memory may be corrupted. Please restart kdevelop." ); } emit patchChanged(); for(int i=0; imodelCount(); i++) { const Diff2::DiffModel* model=m_modelList->modelAt(i); for(int j=0; jdifferences()->count(); j++) { model->differences()->at(j)->apply(m_patch->isAlreadyApplied()); } } highlightPatch(); return; } catch ( const QString & str ) { KMessageBox::error(0, str, i18n("Kompare Model Update")); } catch ( const char * str ) { KMessageBox::error(0, str, i18n("Kompare Model Update")); } removeHighlighting(); m_modelList.reset( 0 ); m_kompareInfo.reset( 0 ); delete m_diffSettings; emit patchChanged(); } K_PLUGIN_FACTORY(KDevProblemReporterFactory, registerPlugin(); ) K_EXPORT_PLUGIN(KDevProblemReporterFactory(KAboutData("kdevpatchreview","kdevpatchreview", ki18n("Patch Review"), "0.1", ki18n("Highlights code affected by a patch"), KAboutData::License_GPL))) class PatchReviewToolViewFactory : public KDevelop::IToolViewFactory { public: PatchReviewToolViewFactory(PatchReviewPlugin *plugin): m_plugin(plugin) {} virtual QWidget* create(QWidget *parent = 0) { return m_plugin->createToolView(parent); } virtual Qt::DockWidgetArea defaultPosition() { return Qt::BottomDockWidgetArea; } virtual QString id() const { return "org.kdevelop.PatchReview"; } private: PatchReviewPlugin *m_plugin; }; PatchReviewPlugin::~PatchReviewPlugin() { removeHighlighting(); delete m_patch; } void PatchReviewPlugin::registerPatch(IPatchSource::Ptr patch) { if(!m_knownPatches.contains(patch)) { m_knownPatches << patch; connect(patch, SIGNAL(destroyed(QObject*)), SLOT(clearPatch(QObject*))); } } void PatchReviewPlugin::clearPatch(QObject* _patch) { kDebug() << "clearing patch" << _patch << "current:" << (QObject*)m_patch; IPatchSource::Ptr patch((IPatchSource*)_patch); m_knownPatches.removeAll(patch); m_knownPatches.removeAll(0); if(patch == m_patch) { kDebug() << "is current patch"; if(!m_knownPatches.empty()) setPatch(m_knownPatches.first()); else setPatch(IPatchSource::Ptr(new LocalPatchSource)); } } #if 0 #if HAVE_KOMPARE void showDiff(const KDevelop::VcsDiff& d) { ICore::self()->uiController()->switchToArea("review", KDevelop::IUiController::ThisWindow); foreach(const VcsLocation& l, d.leftTexts().keys()) { KUrl to; if(d.rightTexts().contains(l)) { KTemporaryFile temp2; temp2.setSuffix("2.patch"); //FIXME: don't leak temp2.setAutoRemove(false); temp2.open(); QTextStream t2(&temp2); t2 << d.rightTexts()[l]; temp2.close(); to=temp2.fileName(); } else to=l.localUrl(); KUrl fakeUrl(to); fakeUrl.setScheme("kdevpatch"); IDocumentFactory* docf=ICore::self()->documentController()->factory("text/x-patch"); IDocument* doc=docf->create(fakeUrl, ICore::self()); IPatchDocument* pdoc=dynamic_cast(doc); Q_ASSERT(pdoc); ICore::self()->documentController()->openDocument(doc); pdoc->setDiff(d.leftTexts()[l], to); } } #endif #endif void PatchReviewPlugin::cancelReview() { if(m_patch) { removeHighlighting(); m_modelList.reset( 0 ); m_patch->cancelReview(); emit patchChanged(); delete m_patch; Sublime::MainWindow* w = dynamic_cast(ICore::self()->uiController()->activeMainWindow()); if(w->area()->objectName() == "review") { + setUniqueWorkingSet(); // Make the working-set unique, so that we don't affect other areas w->area()->clearViews(); ICore::self()->uiController()->switchToArea("code", KDevelop::IUiController::ThisWindow); } } } void PatchReviewPlugin::finishReview(QList< KUrl > selection) { if(m_patch) { if(!m_patch->finishReview(selection)) return; removeHighlighting(); m_modelList.reset( 0 ); emit patchChanged(); if(!dynamic_cast(m_patch.data())) delete m_patch; Sublime::MainWindow* w = dynamic_cast(ICore::self()->uiController()->activeMainWindow()); if(w->area()->objectName() == "review") { w->area()->clearViews(); ICore::self()->uiController()->switchToArea("code", KDevelop::IUiController::ThisWindow); } } } void PatchReviewPlugin::startReview(IPatchSource* patch, IPatchReview::ReviewMode mode) { Q_UNUSED(mode); setPatch(patch); QMetaObject::invokeMethod(this, "updateReview", Qt::QueuedConnection); } +void PatchReviewPlugin::switchAreaAndMakeWorkingSetUique() +{ + Sublime::MainWindow* w = dynamic_cast(ICore::self()->uiController()->activeMainWindow()); + if (w->area()->objectName() != "review") + ICore::self()->uiController()->switchToArea("review", KDevelop::IUiController::ThisWindow); + + setUniqueWorkingSet(); +} + +bool PatchReviewPlugin::isWorkingSetUnique() const +{ + Sublime::MainWindow* w = dynamic_cast(ICore::self()->uiController()->activeMainWindow()); + foreach(Sublime::Area* area, w->areas()) + if(area != w->area() && area->workingSet() == w->area()->workingSet()) + return false; + return true; +} + +void PatchReviewPlugin::setUniqueWorkingSet() +{ + Sublime::MainWindow* w = dynamic_cast(ICore::self()->uiController()->activeMainWindow()); + + if(!w->area()->workingSet().startsWith("review")) + w->area()->setWorkingSet("review"); + + while(!isWorkingSetUnique()) + w->area()->setWorkingSet(QString("review_%1").arg(rand() % 10000)); +} + void PatchReviewPlugin::updateReview() { if(!m_patch) return; m_updateKompareTimer->stop(); updateKompareModel(); - Sublime::MainWindow* w = dynamic_cast(ICore::self()->uiController()->activeMainWindow()); - if (w->area()->objectName() != "review") - ICore::self()->uiController()->switchToArea("review", KDevelop::IUiController::ThisWindow); - - if(!w->area()->workingSet().startsWith("review")) - w->area()->setWorkingSet("review"); + switchAreaAndMakeWorkingSetUique(); if(!m_modelList.get()) return; // list of opened documents to prevent flicker QMap documents; foreach(IDocument* doc, ICore::self()->documentController()->openDocuments()) { documents[doc->url()] = doc; } IDocument* futureActiveDoc = 0; //Open the diff itself #ifdef HAVE_KOMPARE KUrl fakeUrl(m_patch->file()); fakeUrl.setScheme("kdevpatch"); IDocumentFactory* docf=ICore::self()->documentController()->factory("text/x-patch"); IDocument* doc=docf->create(fakeUrl, ICore::self()); IPatchDocument* pdoc=dynamic_cast(doc); Q_ASSERT(pdoc); futureActiveDoc = ICore::self()->documentController()->openDocument(doc); //TODO: close kompare doc if available #else if (!documents.contains(m_patch->file())) { futureActiveDoc = ICore::self()->documentController()->openDocument(m_patch->file()); } else { futureActiveDoc = documents.take(m_patch->file()); } #endif if(m_modelList->modelCount() < maximumFilesToOpenDirectly) { //Open all relates files for(int a = 0; a < m_modelList->modelCount(); ++a) { KUrl absoluteUrl = m_patch->baseDir(); KUrl url(m_modelList->modelAt(a)->destination()); if(url.isRelative()) absoluteUrl.addPath(url.path()); else absoluteUrl = url; if(QFileInfo(absoluteUrl.path()).exists() && absoluteUrl.path() != "/dev/null") { ICore::self()->documentController()->openDocument(absoluteUrl); if (documents.contains(absoluteUrl)) { documents.remove(absoluteUrl); } seekHunk(true, absoluteUrl); //Jump to the first changed position }else{ // Maybe the file was deleted kDebug() << "could not open" << absoluteUrl << "because it doesn't exist"; } } } + Sublime::MainWindow* w = dynamic_cast(ICore::self()->uiController()->activeMainWindow()); // Close views for documents that were loaded from the working set, but are not in the patch QList documentsList = documents.values(); foreach(Sublime::View* view, w->area()->views()) { IDocument* doc = dynamic_cast(view->document()); if(doc && documentsList.contains(doc)) { w->area()->closeView(view); } } Q_ASSERT(futureActiveDoc); ICore::self()->documentController()->activateDocument(futureActiveDoc); bool b = ICore::self()->uiController()->findToolView(i18n("Patch Review"), m_factory); Q_ASSERT(b); } void PatchReviewPlugin::setPatch(IPatchSource* patch) { if(m_patch) { disconnect(m_patch, SIGNAL(patchChanged()), this, SLOT(notifyPatchChanged())); } m_patch = patch; if(m_patch) { kDebug() << "setting new patch" << patch->name() << "with file" << patch->file(); registerPatch(patch); connect(m_patch, SIGNAL(patchChanged()), this, SLOT(notifyPatchChanged())); } notifyPatchChanged(); } PatchReviewPlugin::PatchReviewPlugin(QObject *parent, const QVariantList &) : KDevelop::IPlugin(KDevProblemReporterFactory::componentData(), parent), m_patch(0), m_factory(new PatchReviewToolViewFactory(this)) { KDEV_USE_EXTENSION_INTERFACE( KDevelop::IPatchReview ) core()->uiController()->addToolView(i18n("Patch Review"), m_factory); setXMLFile("kdevpatchreview.rc"); connect(ICore::self()->documentController(), SIGNAL(documentClosed(KDevelop::IDocument*)), this, SLOT(documentClosed(KDevelop::IDocument*))); connect(ICore::self()->documentController(), SIGNAL(textDocumentCreated(KDevelop::IDocument*)), this, SLOT(textDocumentCreated(KDevelop::IDocument*))); m_updateKompareTimer = new QTimer( this ); m_updateKompareTimer->setSingleShot( true ); connect( m_updateKompareTimer, SIGNAL( timeout() ), this, SLOT( updateKompareModel() ) ); setPatch(IPatchSource::Ptr(new LocalPatchSource)); } void PatchReviewPlugin::documentClosed(IDocument* doc) { removeHighlighting(doc->url()); } void PatchReviewPlugin::textDocumentCreated(IDocument* doc) { addHighlighting( doc->url(), doc ); } void PatchReviewPlugin::unload() { core()->uiController()->removeToolView(m_factory); KDevelop::IPlugin::unload(); } QWidget* PatchReviewPlugin::createToolView(QWidget* parent) { return new PatchReviewToolView(parent, this); } void PatchReviewPlugin::exporterSelected(QAction* action) { IPlugin* exporter = qobject_cast(action->data().value()); if(exporter) { qDebug() << "exporting patch" << exporter << action->text(); exporter->extension()->exportPatch(patch()); } } #if 0 void PatchReviewPlugin::determineState() { LocalPatchSourcePointer lpatch = m_patch; if ( !lpatch ) { kDebug() <<"determineState(..) could not lock patch"; } try { if ( lpatch->filename.isEmpty() ) throw "state can only be determined for file-patches"; KUrl fileUrl = lpatch->filename; { K3Process proc; ///Try to apply, if it works, the patch is not applied QString cmd = "patch --dry-run -s -f -i " + fileUrl.toLocalFile(); proc << splitArgs( cmd ); kDebug() << "calling " << cmd; if ( !proc.start( K3Process::Block ) ) throw "could not start process"; if ( !proc.normalExit() ) throw "process did not exit normally"; kDebug() << "exit-status:" << proc.exitStatus(); if ( proc.exitStatus() == 0 ) { // lpatch->state = LocalPatchSource::NotApplied; return; } } { ///Try to revert, of it works, the patch is applied K3Process proc; QString cmd = "patch --dry-run -s -f -i --reverse " + fileUrl.toLocalFile(); proc << splitArgs( cmd ); kDebug() << "calling " << cmd; if ( !proc.start( K3Process::Block ) ) throw "could not start process"; if ( !proc.normalExit() ) throw "process did not exit normally"; kDebug() << "exit-status:" << proc.exitStatus(); if ( proc.exitStatus() == 0 ) { // lpatch->state = LocalPatchSource::Applied; return; } } } catch ( const QString& str ) { kWarning() <<"Error:" << str; } catch ( const char* str ) { kWarning() << "Error:" << str; } // lpatch->state = LocalPatchSource::Unknown; } #endif #include "patchreview.moc" // kate: space-indent on; indent-width 2; tab-width 2; replace-tabs on diff --git a/plugins/patchreview/patchreview.h b/plugins/patchreview/patchreview.h index 58158222ae..c517f34c15 100644 --- a/plugins/patchreview/patchreview.h +++ b/plugins/patchreview/patchreview.h @@ -1,226 +1,234 @@ /*************************************************************************** Copyright 2006 David Nolden ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef PATCHREVIEW_H #define PATCHREVIEW_H #include #include #include #include #include #include "localpatchsource.h" #include "ui_patchreview.h" #include #include #include "libdiff2/diffmodel.h" class PatchReviewToolViewFactory; class PatchReviewPlugin; namespace KParts { class Part; } class QDialog; namespace Diff2 { class KompareModelList; class DiffModel; class DiffModel; } namespace KTextEditor { class Document; class Range; class MovingRange; class Mark; } namespace Kompare { class Info; } namespace KDevelop { class IDocument; } ///Delete itself when the document(or textDocument), or Diff-Model is deleted. class PatchHighlighter : public QObject { Q_OBJECT public: PatchHighlighter( const Diff2::DiffModel* model, KDevelop::IDocument* doc, PatchReviewPlugin* plugin ) throw( QString ); ~PatchHighlighter(); KDevelop::IDocument* doc(); QList ranges() const { return m_differencesForRanges.keys(); } private slots: void documentDestroyed(); void aboutToDeleteMovingInterfaceContent(KTextEditor::Document*); private: void addLineMarker(KTextEditor::MovingRange* arg1, Diff2::Difference* arg2); void removeLineMarker(KTextEditor::MovingRange* arg1, Diff2::Difference* arg2); KTextEditor::MovingRange* rangeForMark(KTextEditor::Mark mark); void clear(); QSet m_ranges; QMap m_differencesForRanges; KDevelop::IDocument* m_doc; PatchReviewPlugin* m_plugin; const Diff2::DiffModel* m_model; public slots: void markToolTipRequested(KTextEditor::Document*,KTextEditor::Mark,QPoint,bool&); void showToolTipForMark(QPoint arg1, KTextEditor::MovingRange* arg2, QPair< int, int > highlightMark = qMakePair(-1, -1)); bool isRemoval(Diff2::Difference*); bool isInsertion(Diff2::Difference*); void markClicked(KTextEditor::Document*,KTextEditor::Mark,bool&); void textInserted(KTextEditor::Document*,KTextEditor::Range); }; class DiffSettings; class PatchReviewPlugin; class PatchReviewToolView : public QWidget { Q_OBJECT public: PatchReviewToolView( QWidget* parent, PatchReviewPlugin* plugin ); ~PatchReviewToolView(); signals: void dialogClosed( PatchReviewToolView* ); void stateChanged( PatchReviewToolView* ); private slots: void fileDoubleClicked( const QModelIndex& i ); void nextHunk(); void prevHunk(); void patchChanged(); void updatePatchFromEdit(); void slotEditCommandChanged(); void slotEditFileNameChanged(); void finishReview(); private: void kompareModelChanged(); void showEditDialog(); ///Fills the editor views from m_editingPatch void fillEditFromPatch(); Ui_EditPatch m_editPatch; QTime m_lastDataTime; QString m_lastTerminalData; QPointer m_konsolePart; bool m_reversed; KUrl urlForFileModel(const Diff2::DiffModel* model); PatchReviewPlugin* m_plugin; QPointer m_customWidget; public slots: void documentActivated(KDevelop::IDocument*); void patchSelectionChanged(int); }; class PatchReviewPlugin : public KDevelop::IPlugin, public KDevelop::IPatchReview { Q_OBJECT Q_INTERFACES( KDevelop::IPatchReview ) public: PatchReviewPlugin(QObject *parent, const QVariantList & = QVariantList() ); ~PatchReviewPlugin(); virtual void unload(); QWidget* createToolView(QWidget* parent); KDevelop::IPatchSource::Ptr patch() const { return m_patch; } QList knownPatches() const { return m_knownPatches; } Diff2::KompareModelList* modelList() const { return m_modelList.get(); } void seekHunk( bool forwards, const KUrl& file = KUrl() ); KUrl diffFile(); void setPatch(KDevelop::IPatchSource* patch); void registerPatch(KDevelop::IPatchSource::Ptr patch); virtual void startReview(KDevelop::IPatchSource* patch, ReviewMode mode); void finishReview(QList selection); Q_SIGNALS: void patchChanged(); public Q_SLOTS: //Does parts of the review-starting that are problematic to do directly in startReview, as they may open dialogs etc. void updateReview(); void cancelReview(); void clearPatch(QObject* patch); void notifyPatchChanged(); void highlightPatch(); void updateKompareModel(); void showPatch(); void forceUpdate(); private Q_SLOTS: void documentClosed(KDevelop::IDocument*); void textDocumentCreated(KDevelop::IDocument*); void exporterSelected(QAction* action); private: + // Switches to the review area, + // makes sure that the working set active in the current area starts with "review" and + // is not active in any other area. Creates new working sets if required. + void switchAreaAndMakeWorkingSetUique(); + // Returns whether the current working set is active only in this area + bool isWorkingSetUnique() const; + // Makes sure that this working set is active only in this area, and that its name starts with "review". + void setUniqueWorkingSet(); QList m_knownPatches; void addHighlighting( const KUrl& file, KDevelop::IDocument* document = 0 ); void removeHighlighting( const KUrl& file = KUrl() ); KDevelop::IPatchSource::Ptr m_patch; QTimer* m_updateKompareTimer; PatchReviewToolViewFactory* m_factory; #if 0 void determineState(); #endif QPointer m_diffSettings; std::auto_ptr m_kompareInfo; std::auto_ptr m_modelList; typedef QMap > HighlightMap; HighlightMap m_highlighters; }; #endif // kate: space-indent on; indent-width 2; tab-width 2; replace-tabs on