annotate mainwindow.h @ 174:4dc802a4d5ae

* Add more helpful reports when a push fails because it would create new heads
author Chris Cannam
date Thu, 16 Dec 2010 12:40:04 +0000
parents a6d336837ebe
children 6def8bf3be44
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@98 6 Based on hgExplorer by Jari Korhonen
Chris@57 7 Copyright (c) 2010 Jari Korhonen
Chris@57 8 Copyright (c) 2010 Chris Cannam
Chris@57 9 Copyright (c) 2010 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
jtkorhonen@0 18 #ifndef MAINWINDOW_H
jtkorhonen@0 19 #define MAINWINDOW_H
jtkorhonen@0 20
Chris@96 21 #include "hgtabwidget.h"
jtkorhonen@0 22 #include "hgrunner.h"
jtkorhonen@0 23 #include "common.h"
Chris@106 24 #include "changeset.h"
Chris@109 25 #include "hgaction.h"
jtkorhonen@0 26
Chris@50 27 #include <QMainWindow>
Chris@50 28 #include <QListWidget>
Chris@90 29 #include <QFileSystemWatcher>
Chris@50 30
jtkorhonen@0 31 QT_BEGIN_NAMESPACE
jtkorhonen@0 32 class QAction;
jtkorhonen@0 33 class QMenu;
jtkorhonen@0 34 QT_END_NAMESPACE
jtkorhonen@0 35
jtkorhonen@0 36 class MainWindow : public QMainWindow
jtkorhonen@0 37 {
jtkorhonen@0 38 Q_OBJECT
jtkorhonen@0 39
jtkorhonen@0 40 public:
Chris@172 41 MainWindow(QString myDirPath);
Chris@98 42 HgTabWidget *hgTabs;
jtkorhonen@0 43 void writeSettings();
jtkorhonen@0 44
jtkorhonen@0 45 //Paths to remote repo & workfolder
jtkorhonen@0 46 //Local repo is directory "./hg/" under work folder
jtkorhonen@0 47 QString remoteRepoPath;
jtkorhonen@0 48 QString workFolderPath;
Chris@106 49 QString currentBranch;
Chris@106 50 Changesets currentHeads;
Chris@108 51 Changesets currentParents;
Chris@133 52 int commitsSincePush;
Chris@173 53 bool stateUnknown;
Chris@120 54 bool needNewLog;
jtkorhonen@0 55
jtkorhonen@0 56 protected:
jtkorhonen@0 57 void closeEvent(QCloseEvent *event);
jtkorhonen@0 58
jtkorhonen@0 59 public slots:
Chris@145 60 void open(QString local);
Chris@120 61 void hgRefresh();
Chris@142 62 void commandCompleted(HgAction action, QString stdOut);
Chris@142 63 void commandFailed(HgAction action, QString stdErr);
Chris@95 64 void enableDisableActions();
jtkorhonen@0 65
jtkorhonen@0 66 private slots:
jtkorhonen@0 67 void about();
Chris@64 68 void settings();
Chris@69 69 void open();
Chris@64 70 void startupDialog();
Chris@94 71 void clearSelections();
Chris@64 72
Chris@120 73 void hgQueryPaths();
Chris@120 74 void hgStat();
jtkorhonen@0 75 void hgRemove();
jtkorhonen@0 76 void hgAdd();
jtkorhonen@0 77 void hgCommit();
Chris@168 78 void hgShowSummary();
jtkorhonen@0 79 void hgFolderDiff();
Chris@148 80 void hgDiffToCurrent(QString);
Chris@148 81 void hgDiffToParent(QString, QString);
jtkorhonen@0 82 void hgUpdate();
jtkorhonen@0 83 void hgRevert();
jtkorhonen@0 84 void hgMerge();
Chris@163 85 void hgMarkResolved(QStringList);
jtkorhonen@33 86 void hgRetryMerge();
jtkorhonen@0 87 void hgCloneFromRemote();
jtkorhonen@0 88 void hgInit();
jtkorhonen@0 89 void hgIncoming();
jtkorhonen@0 90 void hgPush();
jtkorhonen@0 91 void hgPull();
Chris@148 92 void hgUpdateToRev(QString);
Chris@148 93 void hgMergeFrom(QString);
jtkorhonen@0 94 void hgAnnotate();
jtkorhonen@0 95 void hgResolveList();
Chris@164 96 void hgTag(QString);
jtkorhonen@11 97 void hgServe();
jtkorhonen@34 98 void hgIgnore();
jtkorhonen@0 99
Chris@90 100 void fsDirectoryChanged(QString);
Chris@90 101 void fsFileChanged(QString);
Chris@90 102
jtkorhonen@0 103 private:
Chris@109 104 void hgQueryBranch();
Chris@109 105 void hgQueryHeads();
Chris@109 106 void hgQueryParents();
jtkorhonen@0 107 void hgLog();
Chris@150 108 void hgLogIncremental(QStringList prune);
jtkorhonen@0 109 void createActions();
jtkorhonen@0 110 void connectActions();
Chris@141 111 void connectTabsSignals();
jtkorhonen@0 112 void createMenus();
jtkorhonen@0 113 void createToolBars();
jtkorhonen@0 114 void createStatusBar();
jtkorhonen@0 115 void readSettings();
jtkorhonen@0 116 void splitChangeSets(QStringList *list, QString hgLogOutput);
Chris@174 117 void reportNewRemoteHeads(QString);
jtkorhonen@2 118 void presentLongStdoutToUser(QString stdo);
Chris@95 119
jtkorhonen@28 120 QString listAllUpIpV4Addresses();
jtkorhonen@34 121 QString filterTag(QString tag);
jtkorhonen@0 122
Chris@64 123 QString getUserInfo() const;
Chris@64 124
Chris@79 125 bool openLocal(QString);
Chris@79 126 bool openRemote(QString, QString);
Chris@79 127 bool openInit(QString);
Chris@79 128
Chris@79 129 bool complainAboutFilePath(QString);
Chris@79 130 bool complainAboutUnknownFolder(QString);
Chris@84 131 bool complainAboutInitInRepo(QString);
Chris@84 132 bool complainAboutInitFile(QString);
Chris@84 133 bool complainAboutCloneToExisting(QString);
Chris@84 134 bool complainAboutCloneToFile(QString);
Chris@84 135 bool complainAboutCloneToExistingFolder(QString); //!!! not sure about this one
Chris@84 136
Chris@79 137 bool askToInitExisting(QString);
Chris@79 138 bool askToInitNew(QString);
Chris@79 139 bool askToOpenParentRepo(QString, QString);
Chris@84 140 bool askToOpenInsteadOfInit(QString);
Chris@79 141
Chris@120 142 void showIncoming(QString);
Chris@120 143 void showPullResult(QString);
Chris@120 144 void showPushResult(QString);
Chris@125 145 int extractChangeCount(QString);
Chris@125 146 QString format3(QString, QString, QString);
Chris@120 147
Chris@120 148 void clearState();
Chris@120 149
Chris@90 150 void updateFileSystemWatcher();
Chris@90 151
Chris@64 152 bool firstStart;
Chris@64 153
jtkorhonen@0 154 //Actions enabled flags
jtkorhonen@0 155 bool remoteRepoActionsEnabled;
jtkorhonen@0 156 bool localRepoActionsEnabled;
jtkorhonen@0 157
Chris@172 158 QString m_myDirPath;
Chris@172 159
jtkorhonen@0 160 //File menu actions
Chris@69 161 QAction *openAct;
jtkorhonen@0 162 QAction *settingsAct;
jtkorhonen@0 163 QAction *exitAct;
jtkorhonen@0 164
jtkorhonen@33 165 //Repo actions
jtkorhonen@0 166 QAction *hgIncomingAct;
jtkorhonen@0 167 QAction *hgPushAct;
jtkorhonen@0 168 QAction *hgPullAct;
Chris@120 169 QAction *hgRefreshAct;
jtkorhonen@0 170 QAction *hgFolderDiffAct;
jtkorhonen@0 171 QAction *hgChgSetDiffAct;
jtkorhonen@0 172 QAction *hgRevertAct;
jtkorhonen@0 173 QAction *hgAddAct;
jtkorhonen@0 174 QAction *hgRemoveAct;
jtkorhonen@0 175 QAction *hgUpdateAct;
jtkorhonen@0 176 QAction *hgCommitAct;
jtkorhonen@0 177 QAction *hgMergeAct;
jtkorhonen@0 178 QAction *hgUpdateToRevAct;
jtkorhonen@0 179 QAction *hgAnnotateAct;
jtkorhonen@34 180 QAction *hgIgnoreAct;
jtkorhonen@11 181 QAction *hgServeAct;
jtkorhonen@0 182
jtkorhonen@0 183 //Menus
jtkorhonen@0 184 QMenu *fileMenu;
jtkorhonen@0 185 QMenu *advancedMenu;
jtkorhonen@0 186 QMenu *helpMenu;
jtkorhonen@0 187
jtkorhonen@0 188 //Help menu actions
jtkorhonen@0 189 QAction *aboutAct;
jtkorhonen@0 190
Chris@94 191 // Other actions
Chris@94 192 QAction *clearSelectionsAct;
Chris@94 193
jtkorhonen@0 194 QToolBar *fileToolBar;
jtkorhonen@0 195 QToolBar *repoToolBar;
jtkorhonen@0 196 QToolBar *workFolderToolBar;
jtkorhonen@0 197
Chris@109 198 HgRunner *runner;
jtkorhonen@0 199
Chris@163 200 bool shouldHgStat;
Chris@163 201
Chris@163 202 QString diffBinaryName;
Chris@163 203 QString mergeBinaryName;
Chris@163 204
Chris@112 205 void findDiffBinaryName();
Chris@163 206 void findMergeBinaryName();
Chris@112 207
Chris@90 208 QFileSystemWatcher *fsWatcher;
Chris@90 209
Chris@163 210 QString lastStatOutput;
Chris@163 211 QStringList lastRevertedFiles;
Chris@163 212
Chris@112 213 bool justMerged;
Chris@163 214 QString mergeTargetRevision;
Chris@157 215 QString mergeCommitComment;
jtkorhonen@0 216 };
jtkorhonen@0 217
jtkorhonen@0 218 #endif