Differential D27641 Diff 76438 svn/fileviewsvnplugin.cpp

Changeset View

Standalone View

svn/fileviewsvnplugin.cpp

Context not available.
44	#include <QTableWidget>	44		#include <QTableWidget>
45	#include <QHeaderView>	45		#include <QHeaderView>
46		46
		47		#include "svncommitdialog.h"
		48		#include "svncommands.h"
		49
47	K_PLUGIN_FACTORY(FileViewSvnPluginFactory, registerPlugin<FileViewSvnPlugin>();)	50		K_PLUGIN_FACTORY(FileViewSvnPluginFactory, registerPlugin<FileViewSvnPlugin>();)
48		51
49	FileViewSvnPlugin::FileViewSvnPlugin(QObject* parent, const QList<QVariant>& args) :	52		FileViewSvnPlugin::FileViewSvnPlugin(QObject* parent, const QList<QVariant>& args) :
Context not available.
83	m_commitAction->setIcon(QIcon::fromTheme("svn-commit"));	86		m_commitAction->setIcon(QIcon::fromTheme("svn-commit"));
84	m_commitAction->setText(i18nc("@item:inmenu", "SVN Commit..."));	87		m_commitAction->setText(i18nc("@item:inmenu", "SVN Commit..."));
85	connect(m_commitAction, SIGNAL(triggered()),	88		connect(m_commitAction, SIGNAL(triggered()),
86	this, SLOT(commitFiles()));	89		this, SLOT(commitDialog()));
87		90
88	m_addAction = new QAction(this);	91		m_addAction = new QAction(this);
89	m_addAction->setIcon(QIcon::fromTheme("list-add"));	92		m_addAction->setIcon(QIcon::fromTheme("list-add"));
Context not available.
163	case 'A': version = AddedVersion; break;	166		case 'A': version = AddedVersion; break;
164	case 'D': version = RemovedVersion; break;	167		case 'D': version = RemovedVersion; break;
165	case 'C': version = ConflictingVersion; break;	168		case 'C': version = ConflictingVersion; break;
		169		case '!': version = MissingVersion; break;
166	default:	170		default:
167	if (filePath.contains('*')) {	171		if (filePath.contains('*')) {
168	version = UpdateRequiredVersion;	172		version = UpdateRequiredVersion;
Context not available.
205		209
206	void FileViewSvnPlugin::endRetrieval()	210		void FileViewSvnPlugin::endRetrieval()
207	{	211		{
		212		emit versionInfoUpdated();
208	}	213		}
209		214
210	KVersionControlPlugin::ItemVersion FileViewSvnPlugin::itemVersion(const KFileItem& item) const	215		KVersionControlPlugin::ItemVersion FileViewSvnPlugin::itemVersion(const KFileItem& item) const
Context not available.
349	}	354		}
350	}	355		}
351		356
352	void FileViewSvnPlugin::commitFiles()	357		void FileViewSvnPlugin::commitDialog()
353	{	358		{
354	QDialog dialog(0, Qt::Dialog);	359		SvnCommitDialog *svnCommitDialog = new SvnCommitDialog(&m_versionInfoHash);
355
356	QVBoxLayout* boxLayout = new QVBoxLayout(&dialog);
357
358	boxLayout->addWidget(new QLabel(i18nc("@label", "Description:"),
359	&dialog));
360	QPlainTextEdit* editor = new QPlainTextEdit(&dialog);
361	boxLayout->addWidget(editor, 1);
362
363	QFrame* line = new QFrame(&dialog);
364	line->setFrameShape(QFrame::HLine);
365	line->setFrameShadow(QFrame::Sunken);
366	boxLayout->addWidget(line);
367
368	const QStringList header = { i18nc("@title:column", "Path"),
369	i18nc("@title:column", "Status") };
370	const int columnPath = 0;
371	const int columnStatus = 1;
372	QTableWidget *changes = new QTableWidget(m_versionInfoHash.size(), header.size(), &dialog);
373	changes->setHorizontalHeaderLabels(header);
374	changes->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
375	changes->horizontalHeader()->setSectionResizeMode(columnStatus, QHeaderView::ResizeToContents);
376	changes->verticalHeader()->setVisible(false);
377	changes->setSortingEnabled(false);
378
379	QHash<QString, ItemVersion>::const_iterator it = m_versionInfoHash.cbegin();
380	for ( int row = 0 ; it != m_versionInfoHash.cend(); ++it, ++row ) {
381	QTableWidgetItem *path = new QTableWidgetItem( it.key() );
382	QTableWidgetItem *status = new QTableWidgetItem;
383
384	path->setFlags(Qt::ItemIsEnabled \| Qt::ItemIsSelectable);
385	status->setFlags(Qt::ItemIsEnabled \| Qt::ItemIsSelectable);
386
387	changes->setItem(row, columnPath, path);
388	changes->setItem(row, columnStatus, status);
389
390	switch(it.value()) {
391	case UnversionedVersion:
392	status->setText( i18nc("@item:intable", "Unversioned") );
393	break;
394	case LocallyModifiedVersion:
395	status->setText( i18nc("@item:intable", "Modified") );
396	break;
397	case AddedVersion:
398	status->setText( i18nc("@item:intable", "Added") );
399	break;
400	case RemovedVersion:
401	status->setText( i18nc("@item:intable", "Deleted") );
402	break;
403	case ConflictingVersion:
404	status->setText( i18nc("@item:intable", "Conflict") );
405	break;
406	case MissingVersion:
407	status->setText( i18nc("@item:intable", "Missing") );
408	break;
409	case UpdateRequiredVersion:
410	status->setText( i18nc("@item:intable", "Update required") );
411	break;
412	default:
413	// For SVN normaly we shouldn't be here with:
414	// NormalVersion, LocallyModifiedUnstagedVersion, IgnoredVersion.
415	// 'default' is for any future changes in ItemVersion enum.
416	qWarning() << QString("Unknown SVN status for item %1, ItemVersion = %2").arg(it.key()).arg(it.value());
417	status->setText("");
418	}
419	}
420	// Sort by status: unversioned is at the bottom.
421	changes->sortByColumn(columnStatus, Qt::AscendingOrder);
422	boxLayout->addWidget(changes, 3);
423
424	dialog.setWindowTitle(i18nc("@title:window", "SVN Commit"));
425	auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok \| QDialogButtonBox::Cancel, &dialog);
426	connect(buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
427	connect(buttonBox, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
428	auto okButton = buttonBox->button(QDialogButtonBox::Ok);
429
430	okButton->setDefault(true);
431	okButton->setText(i18nc("@action:button", "Commit"));
432	boxLayout->addWidget(buttonBox);
433
434	KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
435	"SvnCommitDialog");
436	dialog.winId(); // Workaround for QTBUG-40584, line 1/2. See KWindowConfig::restoreWindowSize() docs.
437	KWindowConfig::restoreWindowSize(dialog.windowHandle(), dialogConfig);
438	dialog.resize(dialog.windowHandle()->size()); // Workaround for QTBUG-40584, line 2/2. See KWindowConfig::restoreWindowSize() docs.
439
440	if (dialog.exec() == QDialog::Accepted) {
441	// Write the commit description into a temporary file, so
442	// that it can be read by the command "svn commit -F". The temporary
443	// file must stay alive until slotOperationCompleted() is invoked and will
444	// be destroyed when the version plugin is destructed.
445	if (!m_tempFile.open()) {
446	emit errorMessage(i18nc("@info:status", "Commit of SVN changes failed."));
447	return;
448	}
449		360
450	QTextStream out(&m_tempFile);	361		connect(this, &FileViewSvnPlugin::versionInfoUpdated, svnCommitDialog, &SvnCommitDialog::refreshChangesList);
451	const QString fileName = m_tempFile.fileName();
452	out << editor->toPlainText();
453	m_tempFile.close();
454
455	QStringList arguments;
456	arguments << "-F" << fileName;
457	execSvnCommand("commit", arguments,
458	i18nc("@info:status", "Committing SVN changes..."),
459	i18nc("@info:status", "Commit of SVN changes failed."),
460	i18nc("@info:status", "Committed SVN changes."));
461	}
462		362
463	KWindowConfig::saveWindowSize(dialog.windowHandle(), dialogConfig, KConfigBase::Persistent);	363		connect(svnCommitDialog, &SvnCommitDialog::revertFile, this, &FileViewSvnPlugin::revertFile);
		364		connect(svnCommitDialog, &SvnCommitDialog::diffFile, this, &FileViewSvnPlugin::diffFile);
		365		connect(svnCommitDialog, &SvnCommitDialog::addFile, this, &FileViewSvnPlugin::addFile);
		366		connect(svnCommitDialog, &SvnCommitDialog::commit, this, &FileViewSvnPlugin::commitFiles);
		367
		368		svnCommitDialog->setAttribute(Qt::WA_DeleteOnClose);
		369		svnCommitDialog->show();
464	}	370		}
465		371
466	void FileViewSvnPlugin::addFiles()	372		void FileViewSvnPlugin::addFiles()
Context not available.
520	emit itemVersionsChanged();	426		emit itemVersionsChanged();
521	}	427		}
522		428
		429		void FileViewSvnPlugin::revertFile(const QString& filePath)
		430		{
		431		m_contextItems.append( QUrl::fromLocalFile(filePath) );
		432		m_contextDir.clear();
		433
		434		execSvnCommand("revert", QStringList() << filePath,
		435		i18nc("@info:status", "Reverting changes to file..."),
		436		i18nc("@info:status", "Revert file failed."),
		437		i18nc("@info:status", "File reverted."));
		438		}
		439
		440		void FileViewSvnPlugin::diffFile(const QString& filePath)
		441		{
		442		// For a diff we will export last known file revision from a remote and compare. We will not use
		443		// basic SVN action 'svn diff --extensions -U<lines> <fileName>' because we should count lines
		444		// or set maximum number for this.
		445		// With a maximum number (2147483647) 'svn diff' starts to work slowly.
		446
		447		QTemporaryFile *file = new QTemporaryFile(this);
		448		///\todo Calling a blocking operation: with a slow connection this might take some time.
		449		if (!SVNCommands::exportLocalFile(filePath, SVNCommands::localRevision(filePath), file)) {
		450		emit errorMessage(i18nc("@info:status", "Could not show local SVN changes for a file: could not get file."));
			mevenUnsubmitted Done Todos are more commonly written //TODO within our codebase. meven: Todos are more commonly written //TODO within our codebase.
		451		file->deleteLater();
		452		}
		453
		454		const bool started = QProcess::startDetached(
		455		QLatin1String("kompare"),
		456		QStringList {
		457		file->fileName(),
		458		filePath
		459		}
		460		);
		461		if (!started) {
		462		emit errorMessage(i18nc("@info:status", "Could not show local SVN changes: could not start kompare."));
		463		file->deleteLater();
		464		}
		465		}
		466
		467		void FileViewSvnPlugin::addFile(const QString& filePath)
		468		{
		469		m_contextItems.append( QUrl::fromLocalFile(filePath) );
		470		m_contextDir.clear();
		471
		472		addFiles();
		473		}
		474
		475		void FileViewSvnPlugin::commitFiles(const QString& msg)
		476		{
		477		// Write the commit description into a temporary file, so
		478		// that it can be read by the command "svn commit -F". The temporary
		479		// file must stay alive until slotOperationCompleted() is invoked and will
		480		// be destroyed when the version plugin is destructed.
		481		if (!m_tempFile.open()) {
		482		emit errorMessage(i18nc("@info:status", "Commit of SVN changes failed."));
			mevenUnsubmitted Done Well now is a good time ;) meven: Well now is a good time ;)
		483		return;
		484		}
		485
		486		QTextStream out(&m_tempFile);
		487		const QString fileName = m_tempFile.fileName();
		488		out << msg;
		489		m_tempFile.close();
		490
		491		QStringList arguments;
		492		arguments << "-F" << fileName;
		493		execSvnCommand("commit", arguments,
		494		i18nc("@info:status", "Committing SVN changes..."),
		495		i18nc("@info:status", "Commit of SVN changes failed."),
		496		i18nc("@info:status", "Committed SVN changes."));
		497		}
		498
523	void FileViewSvnPlugin::execSvnCommand(const QString& svnCommand,	499		void FileViewSvnPlugin::execSvnCommand(const QString& svnCommand,
524	const QStringList& arguments,	500		const QStringList& arguments,
525	const QString& infoMsg,	501		const QString& infoMsg,
Context not available.