Mercurial > hg > easyhg
comparison mainwindow.h @ 163:5c262ac73948
* First cut of work on merge/resolve logic
author | Chris Cannam |
---|---|
date | Fri, 03 Dec 2010 19:35:04 +0000 |
parents | 910c2c5d1873 |
children | de39da2f9f4d |
comparison
equal
deleted
inserted
replaced
162:910c2c5d1873 | 163:5c262ac73948 |
---|---|
78 void hgDiffToCurrent(QString); | 78 void hgDiffToCurrent(QString); |
79 void hgDiffToParent(QString, QString); | 79 void hgDiffToParent(QString, QString); |
80 void hgUpdate(); | 80 void hgUpdate(); |
81 void hgRevert(); | 81 void hgRevert(); |
82 void hgMerge(); | 82 void hgMerge(); |
83 void hgMarkResolved(QStringList); | |
83 void hgRetryMerge(); | 84 void hgRetryMerge(); |
84 void hgCloneFromRemote(); | 85 void hgCloneFromRemote(); |
85 void hgInit(); | 86 void hgInit(); |
86 void hgIncoming(); | 87 void hgIncoming(); |
87 void hgPush(); | 88 void hgPush(); |
88 void hgPull(); | 89 void hgPull(); |
89 void hgUpdateToRev(QString); | 90 void hgUpdateToRev(QString); |
90 void hgMergeFrom(QString); | 91 void hgMergeFrom(QString); |
91 void hgAnnotate(); | 92 void hgAnnotate(); |
92 void hgResolveList(); | 93 void hgResolveList(); |
93 void hgResolveMark(); | |
94 void hgTag(); | 94 void hgTag(); |
95 void hgServe(); | 95 void hgServe(); |
96 void hgIgnore(); | 96 void hgIgnore(); |
97 | 97 |
98 void fsDirectoryChanged(QString); | 98 void fsDirectoryChanged(QString); |
170 QAction *hgAddAct; | 170 QAction *hgAddAct; |
171 QAction *hgRemoveAct; | 171 QAction *hgRemoveAct; |
172 QAction *hgUpdateAct; | 172 QAction *hgUpdateAct; |
173 QAction *hgCommitAct; | 173 QAction *hgCommitAct; |
174 QAction *hgMergeAct; | 174 QAction *hgMergeAct; |
175 QAction *hgRetryMergeAct; | |
176 QAction *hgUpdateToRevAct; | 175 QAction *hgUpdateToRevAct; |
177 QAction *hgAnnotateAct; | 176 QAction *hgAnnotateAct; |
178 QAction *hgResolveListAct; | |
179 QAction *hgResolveMarkAct; | |
180 QAction *hgTagAct; | 177 QAction *hgTagAct; |
181 QAction *hgIgnoreAct; | 178 QAction *hgIgnoreAct; |
182 QAction *hgServeAct; | 179 QAction *hgServeAct; |
183 | 180 |
184 //Menus | 181 //Menus |
197 QToolBar *repoToolBar; | 194 QToolBar *repoToolBar; |
198 QToolBar *workFolderToolBar; | 195 QToolBar *workFolderToolBar; |
199 | 196 |
200 HgRunner *runner; | 197 HgRunner *runner; |
201 | 198 |
199 bool shouldHgStat; | |
200 | |
201 QString diffBinaryName; | |
202 QString mergeBinaryName; | |
203 | |
202 void findDiffBinaryName(); | 204 void findDiffBinaryName(); |
203 QString diffBinaryName; | 205 void findMergeBinaryName(); |
204 | 206 |
205 QFileSystemWatcher *fsWatcher; | 207 QFileSystemWatcher *fsWatcher; |
206 | 208 |
209 QString lastStatOutput; | |
210 QStringList lastRevertedFiles; | |
211 | |
207 bool justMerged; | 212 bool justMerged; |
213 QString mergeTargetRevision; | |
208 QString mergeCommitComment; | 214 QString mergeCommitComment; |
209 }; | 215 }; |
210 | 216 |
211 #endif | 217 #endif |