Mercurial > hg > easyhg
comparison mainwindow.h @ 33:ff8d64625aa3
Added retry_merge. Fixed bug in "after merge" commit.
author | Jari Korhonen <jtkorhonen@gmail.com> |
---|---|
date | Sat, 19 Jun 2010 00:23:09 +0300 |
parents | 45bfb8dc1faf |
children | 43e3b271d293 |
comparison
equal
deleted
inserted
replaced
32:4f307720272f | 33:ff8d64625aa3 |
---|---|
38 ACT_UPDATE, | 38 ACT_UPDATE, |
39 ACT_REVERT, | 39 ACT_REVERT, |
40 ACT_MERGE, | 40 ACT_MERGE, |
41 ACT_RESOLVE_LIST, | 41 ACT_RESOLVE_LIST, |
42 ACT_SERVE, | 42 ACT_SERVE, |
43 ACT_RESOLVE_MARK | 43 ACT_RESOLVE_MARK, |
44 ACT_RETRY_MERGE, | |
44 }; | 45 }; |
45 | 46 |
46 | 47 |
47 class MainWindow : public QMainWindow | 48 class MainWindow : public QMainWindow |
48 { | 49 { |
83 void hgFolderDiff(); | 84 void hgFolderDiff(); |
84 void hgChgSetDiff(); | 85 void hgChgSetDiff(); |
85 void hgUpdate(); | 86 void hgUpdate(); |
86 void hgRevert(); | 87 void hgRevert(); |
87 void hgMerge(); | 88 void hgMerge(); |
89 void hgRetryMerge(); | |
88 void settings(); | 90 void settings(); |
89 void hgCloneFromRemote(); | 91 void hgCloneFromRemote(); |
90 void hgInit(); | 92 void hgInit(); |
91 void hgIncoming(); | 93 void hgIncoming(); |
92 void hgPush(); | 94 void hgPush(); |
128 QAction *hgInitAct; | 130 QAction *hgInitAct; |
129 QAction *hgCloneFromRemoteAct; | 131 QAction *hgCloneFromRemoteAct; |
130 QAction *settingsAct; | 132 QAction *settingsAct; |
131 QAction *exitAct; | 133 QAction *exitAct; |
132 | 134 |
135 //Repo actions | |
133 QAction *hgIncomingAct; | 136 QAction *hgIncomingAct; |
134 QAction *hgPushAct; | 137 QAction *hgPushAct; |
135 QAction *hgPullAct; | 138 QAction *hgPullAct; |
136 QAction *hgStatAct; | 139 QAction *hgStatAct; |
137 QAction *hgFileDiffAct; | 140 QAction *hgFileDiffAct; |
141 QAction *hgAddAct; | 144 QAction *hgAddAct; |
142 QAction *hgRemoveAct; | 145 QAction *hgRemoveAct; |
143 QAction *hgUpdateAct; | 146 QAction *hgUpdateAct; |
144 QAction *hgCommitAct; | 147 QAction *hgCommitAct; |
145 QAction *hgMergeAct; | 148 QAction *hgMergeAct; |
149 QAction *hgRetryMergeAct; | |
146 QAction *hgUpdateToRevAct; | 150 QAction *hgUpdateToRevAct; |
147 QAction *hgAnnotateAct; | 151 QAction *hgAnnotateAct; |
148 QAction *hgResolveListAct; | 152 QAction *hgResolveListAct; |
149 QAction *hgResolveMarkAct; | 153 QAction *hgResolveMarkAct; |
150 QAction *hgServeAct; | 154 QAction *hgServeAct; |
164 | 168 |
165 int timerId; | 169 int timerId; |
166 HGACTIONS runningAction; | 170 HGACTIONS runningAction; |
167 HgRunner *runner; | 171 HgRunner *runner; |
168 | 172 |
169 int tabPage; | 173 int tabPage; |
170 unsigned char initialFileTypesBits; | 174 unsigned char initialFileTypesBits; |
175 bool justMerged; | |
171 }; | 176 }; |
172 | 177 |
173 #endif | 178 #endif |