annotate src/hgtabwidget.cpp @ 505:1c05e7576ea5

Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes
author Chris Cannam
date Mon, 17 Oct 2011 16:25:02 +0100
parents 896b7903e8f2
children 470829a21f98
rev   line source
Chris@57 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
Chris@57 2
Chris@57 3 /*
Chris@57 4 EasyMercurial
Chris@57 5
Chris@57 6 Based on HgExplorer by Jari Korhonen
Chris@57 7 Copyright (c) 2010 Jari Korhonen
Chris@244 8 Copyright (c) 2011 Chris Cannam
Chris@244 9 Copyright (c) 2011 Queen Mary, University of London
Chris@57 10
Chris@57 11 This program is free software; you can redistribute it and/or
Chris@57 12 modify it under the terms of the GNU General Public License as
Chris@57 13 published by the Free Software Foundation; either version 2 of the
Chris@57 14 License, or (at your option) any later version. See the file
Chris@57 15 COPYING included with this distribution for more information.
Chris@57 16 */
jtkorhonen@0 17
Chris@96 18 #include "hgtabwidget.h"
jtkorhonen@0 19 #include "common.h"
Chris@88 20 #include "filestatuswidget.h"
Chris@116 21 #include "historywidget.h"
Chris@44 22
Chris@50 23 #include <QClipboard>
Chris@50 24 #include <QContextMenuEvent>
Chris@50 25 #include <QApplication>
Chris@50 26
Chris@44 27 #include <iostream>
jtkorhonen@0 28
Chris@96 29 HgTabWidget::HgTabWidget(QWidget *parent,
Chris@95 30 QString workFolderPath) :
Chris@505 31 QTabWidget(parent),
Chris@505 32 m_haveMerge(false)
jtkorhonen@0 33 {
Chris@326 34 // Work tab
Chris@116 35 m_fileStatusWidget = new FileStatusWidget;
Chris@116 36 m_fileStatusWidget->setLocalPath(workFolderPath);
Chris@326 37
Chris@116 38 connect(m_fileStatusWidget, SIGNAL(selectionChanged()),
Chris@95 39 this, SIGNAL(selectionChanged()));
Chris@326 40
Chris@484 41 connect(m_fileStatusWidget, SIGNAL(showAllChanged()),
Chris@484 42 this, SIGNAL(showAllChanged()));
Chris@326 43
Chris@326 44 connect(m_fileStatusWidget, SIGNAL(annotateFiles(QStringList)),
Chris@326 45 this, SIGNAL(annotateFiles(QStringList)));
Chris@326 46
Chris@326 47 connect(m_fileStatusWidget, SIGNAL(diffFiles(QStringList)),
Chris@326 48 this, SIGNAL(diffFiles(QStringList)));
Chris@326 49
Chris@326 50 connect(m_fileStatusWidget, SIGNAL(commitFiles(QStringList)),
Chris@326 51 this, SIGNAL(commitFiles(QStringList)));
Chris@326 52
Chris@326 53 connect(m_fileStatusWidget, SIGNAL(revertFiles(QStringList)),
Chris@326 54 this, SIGNAL(revertFiles(QStringList)));
Chris@326 55
Chris@361 56 connect(m_fileStatusWidget, SIGNAL(renameFiles(QStringList)),
Chris@361 57 this, SIGNAL(renameFiles(QStringList)));
Chris@361 58
Chris@361 59 connect(m_fileStatusWidget, SIGNAL(copyFiles(QStringList)),
Chris@361 60 this, SIGNAL(copyFiles(QStringList)));
Chris@361 61
Chris@326 62 connect(m_fileStatusWidget, SIGNAL(addFiles(QStringList)),
Chris@326 63 this, SIGNAL(addFiles(QStringList)));
Chris@326 64
Chris@326 65 connect(m_fileStatusWidget, SIGNAL(removeFiles(QStringList)),
Chris@326 66 this, SIGNAL(removeFiles(QStringList)));
Chris@326 67
Chris@326 68 connect(m_fileStatusWidget, SIGNAL(redoFileMerges(QStringList)),
Chris@326 69 this, SIGNAL(redoFileMerges(QStringList)));
Chris@326 70
Chris@326 71 connect(m_fileStatusWidget, SIGNAL(markFilesResolved(QStringList)),
Chris@326 72 this, SIGNAL(markFilesResolved(QStringList)));
Chris@326 73
Chris@326 74 connect(m_fileStatusWidget, SIGNAL(ignoreFiles(QStringList)),
Chris@326 75 this, SIGNAL(ignoreFiles(QStringList)));
Chris@326 76
Chris@326 77 connect(m_fileStatusWidget, SIGNAL(unIgnoreFiles(QStringList)),
Chris@326 78 this, SIGNAL(unIgnoreFiles(QStringList)));
Chris@326 79
Chris@116 80 addTab(m_fileStatusWidget, tr("My work"));
Chris@88 81
Chris@326 82 // History graph tab
Chris@116 83 m_historyWidget = new HistoryWidget;
Chris@116 84 addTab(m_historyWidget, tr("History"));
Chris@141 85
Chris@141 86 connect(m_historyWidget, SIGNAL(commit()),
Chris@141 87 this, SIGNAL(commit()));
Chris@141 88
Chris@141 89 connect(m_historyWidget, SIGNAL(revert()),
Chris@141 90 this, SIGNAL(revert()));
Chris@141 91
Chris@168 92 connect(m_historyWidget, SIGNAL(showSummary()),
Chris@168 93 this, SIGNAL(showSummary()));
Chris@168 94
Chris@311 95 connect(m_historyWidget, SIGNAL(newBranch()),
Chris@311 96 this, SIGNAL(newBranch()));
Chris@311 97
Chris@311 98 connect(m_historyWidget, SIGNAL(noBranch()),
Chris@311 99 this, SIGNAL(noBranch()));
Chris@311 100
Chris@141 101 connect(m_historyWidget, SIGNAL(diffWorkingFolder()),
Chris@141 102 this, SIGNAL(diffWorkingFolder()));
Chris@141 103
Chris@153 104 connect(m_historyWidget, SIGNAL(showWork()),
Chris@153 105 this, SLOT(showWorkTab()));
Chris@153 106
Chris@141 107 connect(m_historyWidget, SIGNAL(updateTo(QString)),
Chris@141 108 this, SIGNAL(updateTo(QString)));
Chris@141 109
Chris@141 110 connect(m_historyWidget, SIGNAL(diffToCurrent(QString)),
Chris@141 111 this, SIGNAL(diffToCurrent(QString)));
Chris@141 112
Chris@148 113 connect(m_historyWidget, SIGNAL(diffToParent(QString, QString)),
Chris@148 114 this, SIGNAL(diffToParent(QString, QString)));
Chris@141 115
Chris@289 116 connect(m_historyWidget, SIGNAL(showSummary(Changeset *)),
Chris@289 117 this, SIGNAL(showSummary(Changeset *)));
Chris@288 118
Chris@141 119 connect(m_historyWidget, SIGNAL(mergeFrom(QString)),
Chris@141 120 this, SIGNAL(mergeFrom(QString)));
Chris@141 121
Chris@278 122 connect(m_historyWidget, SIGNAL(newBranch(QString)),
Chris@278 123 this, SIGNAL(newBranch(QString)));
Chris@278 124
Chris@141 125 connect(m_historyWidget, SIGNAL(tag(QString)),
Chris@141 126 this, SIGNAL(tag(QString)));
jtkorhonen@32 127 }
jtkorhonen@32 128
Chris@96 129 void HgTabWidget::clearSelections()
Chris@94 130 {
Chris@116 131 m_fileStatusWidget->clearSelections();
Chris@94 132 }
Chris@94 133
Chris@153 134 void HgTabWidget::setCurrent(QStringList ids, QString branch)
Chris@128 135 {
Chris@505 136 m_historyWidget->setCurrent(ids, branch, haveChangesToCommit());
Chris@129 137 }
Chris@129 138
Chris@230 139 void HgTabWidget::updateFileStates()
Chris@230 140 {
Chris@230 141 m_fileStatusWidget->updateWidgets();
Chris@230 142 }
Chris@230 143
Chris@154 144 void HgTabWidget::updateHistory()
Chris@154 145 {
Chris@154 146 m_historyWidget->update();
Chris@154 147 }
Chris@154 148
Chris@163 149 bool HgTabWidget::canDiff() const
Chris@163 150 {
Chris@237 151 return canRevert();
Chris@163 152 }
Chris@163 153
Chris@96 154 bool HgTabWidget::canCommit() const
Chris@90 155 {
Chris@505 156 if (!haveChangesToCommit()) return false;
Chris@505 157 if (!getAllUnresolvedFiles().empty()) return false;
Chris@326 158 return true;
Chris@90 159 }
jtkorhonen@0 160
Chris@109 161 bool HgTabWidget::canRevert() const
Chris@109 162 {
Chris@237 163 // Not the same as canCommit() -- we can revert (and diff)
Chris@237 164 // unresolved files, but we can't commit them
Chris@505 165 if (!haveChangesToCommit() &&
Chris@505 166 getAllUnresolvedFiles().empty()) return false;
Chris@326 167 return true;
Chris@109 168 }
Chris@109 169
Chris@96 170 bool HgTabWidget::canAdd() const
Chris@95 171 {
Chris@327 172 // Permit this only when work tab is visible
Chris@327 173 if (currentIndex() != 0) return false;
Chris@327 174
Chris@505 175 QStringList addable = getSelectedAddableFiles();
Chris@204 176 if (addable.empty()) return false;
Chris@204 177
Chris@505 178 QStringList removable = getSelectedRemovableFiles();
Chris@204 179 if (!removable.empty()) return false;
Chris@204 180
Chris@326 181 return true;
Chris@95 182 }
Chris@95 183
Chris@96 184 bool HgTabWidget::canRemove() const
Chris@95 185 {
Chris@327 186 // Permit this only when work tab is visible
Chris@327 187 if (currentIndex() != 0) return false;
Chris@327 188
Chris@505 189 if (getSelectedRemovableFiles().empty()) return false;
Chris@505 190 if (!getSelectedAddableFiles().empty()) return false;
Chris@95 191 return true;
Chris@95 192 }
Chris@95 193
Chris@163 194 bool HgTabWidget::canResolve() const
Chris@95 195 {
Chris@505 196 return !getAllUnresolvedFiles().empty();
Chris@95 197 }
Chris@95 198
Chris@425 199 bool HgTabWidget::canIgnore() const
Chris@425 200 {
Chris@425 201 return canAdd();
Chris@425 202 }
Chris@425 203
Chris@172 204 bool HgTabWidget::haveChangesToCommit() const
Chris@172 205 {
Chris@505 206 return m_haveMerge || m_fileStatusWidget->haveChangesToCommit();
Chris@172 207 }
Chris@172 208
Chris@109 209 QStringList HgTabWidget::getAllCommittableFiles() const
Chris@109 210 {
Chris@116 211 return m_fileStatusWidget->getAllCommittableFiles();
Chris@109 212 }
Chris@109 213
Chris@109 214 QStringList HgTabWidget::getAllRevertableFiles() const
Chris@109 215 {
Chris@116 216 return m_fileStatusWidget->getAllRevertableFiles();
Chris@109 217 }
Chris@109 218
Chris@96 219 QStringList HgTabWidget::getSelectedAddableFiles() const
Chris@95 220 {
Chris@116 221 return m_fileStatusWidget->getSelectedAddableFiles();
Chris@95 222 }
Chris@95 223
Chris@96 224 QStringList HgTabWidget::getSelectedRemovableFiles() const
Chris@95 225 {
Chris@116 226 return m_fileStatusWidget->getSelectedRemovableFiles();
Chris@95 227 }
Chris@95 228
Chris@163 229 QStringList HgTabWidget::getAllUnresolvedFiles() const
Chris@163 230 {
Chris@163 231 return m_fileStatusWidget->getAllUnresolvedFiles();
Chris@163 232 }
Chris@163 233
Chris@96 234 void HgTabWidget::updateWorkFolderFileList(QString fileList)
jtkorhonen@0 235 {
Chris@116 236 m_fileStates.parseStates(fileList);
Chris@116 237 m_fileStatusWidget->setFileStates(m_fileStates);
jtkorhonen@0 238 }
jtkorhonen@0 239
Chris@505 240 void HgTabWidget::setHaveMerge(bool haveMerge)
Chris@505 241 {
Chris@505 242 if (m_haveMerge != haveMerge) {
Chris@505 243 m_haveMerge = haveMerge;
Chris@505 244 m_historyWidget->setShowUncommitted(haveChangesToCommit());
Chris@505 245 updateHistory();
Chris@505 246 }
Chris@505 247 }
Chris@505 248
Chris@120 249 void HgTabWidget::setNewLog(QString hgLogList)
jtkorhonen@0 250 {
Chris@120 251 m_historyWidget->parseNewLog(hgLogList);
Chris@134 252 if (m_historyWidget->haveNewItems()) {
Chris@153 253 showHistoryTab();
Chris@134 254 }
Chris@120 255 }
Chris@120 256
Chris@120 257 void HgTabWidget::addIncrementalLog(QString hgLogList)
Chris@120 258 {
Chris@120 259 m_historyWidget->parseIncrementalLog(hgLogList);
Chris@134 260 if (m_historyWidget->haveNewItems()) {
Chris@153 261 showHistoryTab();
Chris@134 262 }
jtkorhonen@0 263 }
jtkorhonen@0 264
Chris@287 265 void HgTabWidget::setLocalPath(QString workFolderPath)
jtkorhonen@0 266 {
Chris@116 267 m_fileStatusWidget->setLocalPath(workFolderPath);
Chris@106 268 }
Chris@153 269
Chris@153 270 void HgTabWidget::showWorkTab()
Chris@153 271 {
Chris@153 272 setCurrentWidget(m_fileStatusWidget);
Chris@153 273 }
Chris@153 274
Chris@153 275 void HgTabWidget::showHistoryTab()
Chris@153 276 {
Chris@153 277 setCurrentWidget(m_historyWidget);
Chris@153 278 }
Chris@153 279
Chris@484 280 bool HgTabWidget::shouldShowAll() const
Chris@484 281 {
Chris@484 282 return m_fileStatusWidget->shouldShowAll();
Chris@484 283 }
Chris@484 284