Mercurial > hg > easyhg
view hgtabwidget.cpp @ 237:c9a7e4ec2f78
* Try to do the right thing when completely reverting a merge (forget that the merge took place)
* When trying to clone from remote repo to existing local dir, offer to create a subdir instead
* Tidy up clone-successful notification
* Add a note to commit and revert confirmation dialogs to tell user if they are committing/reverting only a subset of available files
author | Chris Cannam |
---|---|
date | Mon, 10 Jan 2011 12:44:03 +0000 |
parents | e67bd8abc3e3 |
children | 8fd71f570884 |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* EasyMercurial Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen Copyright (c) 2010 Chris Cannam Copyright (c) 2010 Queen Mary, University of London 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. See the file COPYING included with this distribution for more information. */ #include "hgtabwidget.h" #include "common.h" #include "filestatuswidget.h" #include "historywidget.h" #include <QClipboard> #include <QContextMenuEvent> #include <QApplication> #include <iostream> HgTabWidget::HgTabWidget(QWidget *parent, QString remoteRepo, QString workFolderPath) : QTabWidget(parent) { // Work page m_fileStatusWidget = new FileStatusWidget; m_fileStatusWidget->setLocalPath(workFolderPath); m_fileStatusWidget->setRemoteURL(remoteRepo); connect(m_fileStatusWidget, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged())); connect(m_fileStatusWidget, SIGNAL(showAllChanged(bool)), this, SIGNAL(showAllChanged(bool))); addTab(m_fileStatusWidget, tr("My work")); // History graph page m_historyWidget = new HistoryWidget; addTab(m_historyWidget, tr("History")); connect(m_historyWidget, SIGNAL(commit()), this, SIGNAL(commit())); connect(m_historyWidget, SIGNAL(revert()), this, SIGNAL(revert())); connect(m_historyWidget, SIGNAL(showSummary()), this, SIGNAL(showSummary())); connect(m_historyWidget, SIGNAL(diffWorkingFolder()), this, SIGNAL(diffWorkingFolder())); connect(m_historyWidget, SIGNAL(showWork()), this, SLOT(showWorkTab())); connect(m_historyWidget, SIGNAL(updateTo(QString)), this, SIGNAL(updateTo(QString))); connect(m_historyWidget, SIGNAL(diffToCurrent(QString)), this, SIGNAL(diffToCurrent(QString))); connect(m_historyWidget, SIGNAL(diffToParent(QString, QString)), this, SIGNAL(diffToParent(QString, QString))); connect(m_historyWidget, SIGNAL(mergeFrom(QString)), this, SIGNAL(mergeFrom(QString))); connect(m_historyWidget, SIGNAL(tag(QString)), this, SIGNAL(tag(QString))); } void HgTabWidget::clearSelections() { m_fileStatusWidget->clearSelections(); } void HgTabWidget::setCurrent(QStringList ids, QString branch) { bool showUncommitted = haveChangesToCommit(); m_historyWidget->setCurrent(ids, branch, showUncommitted); } void HgTabWidget::updateFileStates() { m_fileStatusWidget->updateWidgets(); } void HgTabWidget::updateHistory() { m_historyWidget->update(); } bool HgTabWidget::canDiff() const { return canRevert(); } bool HgTabWidget::canCommit() const { if (!m_fileStatusWidget->haveChangesToCommit()) return false; if (!m_fileStatusWidget->getAllUnresolvedFiles().empty()) return false; QStringList addable = m_fileStatusWidget->getSelectedAddableFiles(); if (addable.empty()) return true; QStringList committable = m_fileStatusWidget->getSelectedCommittableFiles(); // "Removed" files are both committable and addable; don't return // a false negative if the selection only contains these if (committable == addable) return true; return false; } bool HgTabWidget::canRevert() const { // Not the same as canCommit() -- we can revert (and diff) // unresolved files, but we can't commit them if (!m_fileStatusWidget->haveChangesToCommit() && m_fileStatusWidget->getAllUnresolvedFiles().empty()) return false; // The rest of this logic is as in canCommit though QStringList addable = m_fileStatusWidget->getSelectedAddableFiles(); if (addable.empty()) return true; QStringList committable = m_fileStatusWidget->getSelectedCommittableFiles(); if (committable == addable) return true; return false; } bool HgTabWidget::canAdd() const { QStringList addable = m_fileStatusWidget->getSelectedAddableFiles(); if (addable.empty()) return false; QStringList removable = m_fileStatusWidget->getSelectedRemovableFiles(); if (!removable.empty()) return false; QStringList committable = m_fileStatusWidget->getSelectedCommittableFiles(); // "Removed" files are both committable and addable; don't return // a false negative if the selection only contains these if (committable == addable || committable.empty()) return true; return false; } bool HgTabWidget::canRemove() const { if (m_fileStatusWidget->getSelectedRemovableFiles().empty()) return false; if (!m_fileStatusWidget->getSelectedAddableFiles().empty()) return false; return true; } bool HgTabWidget::canResolve() const { return !m_fileStatusWidget->getSelectedUnresolvedFiles().empty(); } bool HgTabWidget::haveChangesToCommit() const { return m_fileStatusWidget->haveChangesToCommit(); } QStringList HgTabWidget::getAllSelectedFiles() const { return m_fileStatusWidget->getAllSelectedFiles(); } QStringList HgTabWidget::getAllCommittableFiles() const { return m_fileStatusWidget->getAllCommittableFiles(); } QStringList HgTabWidget::getSelectedCommittableFiles() const { return m_fileStatusWidget->getSelectedCommittableFiles(); } QStringList HgTabWidget::getAllRevertableFiles() const { return m_fileStatusWidget->getAllRevertableFiles(); } QStringList HgTabWidget::getSelectedRevertableFiles() const { return m_fileStatusWidget->getSelectedRevertableFiles(); } QStringList HgTabWidget::getSelectedAddableFiles() const { return m_fileStatusWidget->getSelectedAddableFiles(); } QStringList HgTabWidget::getAllRemovableFiles() const { return m_fileStatusWidget->getAllRemovableFiles(); } QStringList HgTabWidget::getSelectedRemovableFiles() const { return m_fileStatusWidget->getSelectedRemovableFiles(); } QStringList HgTabWidget::getAllUnresolvedFiles() const { return m_fileStatusWidget->getAllUnresolvedFiles(); } QStringList HgTabWidget::getSelectedUnresolvedFiles() const { return m_fileStatusWidget->getSelectedUnresolvedFiles(); } void HgTabWidget::updateWorkFolderFileList(QString fileList) { m_fileStates.parseStates(fileList); m_fileStatusWidget->setFileStates(m_fileStates); } void HgTabWidget::setNewLog(QString hgLogList) { m_historyWidget->parseNewLog(hgLogList); if (m_historyWidget->haveNewItems()) { showHistoryTab(); } } void HgTabWidget::addIncrementalLog(QString hgLogList) { m_historyWidget->parseIncrementalLog(hgLogList); if (m_historyWidget->haveNewItems()) { showHistoryTab(); } } void HgTabWidget::setWorkFolderAndRepoNames(QString workFolderPath, QString remoteRepoPath) { m_fileStatusWidget->setLocalPath(workFolderPath); m_fileStatusWidget->setRemoteURL(remoteRepoPath); } void HgTabWidget::setState(QString state) { m_fileStatusWidget->setState(state); } void HgTabWidget::showWorkTab() { setCurrentWidget(m_fileStatusWidget); } void HgTabWidget::showHistoryTab() { setCurrentWidget(m_historyWidget); }