Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

commit: improve signal setups and shutdown

Changeset 4c4cb53395df…

Parent 1c908968d442…

by Steve Borho

Changes to one file · Browse files at 4c4cb53395df Showing diff from parent 1c908968d442 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
30
31
32
 
 
33
34
35
 
117
118
119
 
120
121
122
 
137
138
139
140
141
142
143
144
145
146
147
148
149
 
 
 
150
151
152
153
154
155
156
157
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
158
159
160
161
162
163
 
206
207
208
 
 
 
 
209
210
211
212
213
214
215
216
217
218
 
229
230
231
232
233
234
235
236
 
237
238
239
 
30
31
32
33
34
35
36
37
 
119
120
121
122
123
124
125
 
140
141
142
 
 
 
 
 
 
 
 
 
 
143
144
145
146
 
 
 
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
 
174
175
176
 
219
220
221
222
223
224
225
226
227
 
 
 
 
 
228
229
230
 
241
242
243
 
 
 
 
 
244
245
246
247
@@ -30,6 +30,8 @@
    self.opts = opts # user, date   self.stwidget = status.StatusWidget(pats, opts, root, self) + self.connect(self.stwidget, SIGNAL('errorMessage'), + lambda m: self.emit(SIGNAL('errorMessage'), m))   self.msghistory = []     layout = QVBoxLayout() @@ -117,6 +119,7 @@
  repoid = str(repo[0])   # message history is stored in unicode   self.msghistory = list(s.value('commit/history-'+repoid).toStringList()) + self.msghistory = [s for s in self.msghistory if s]   self.msgcombo.reset(self.msghistory)   try:   curmsg = repo.opener('cur-message.txt').read() @@ -137,27 +140,37 @@
  except EnvironmentError:   pass   - def commit(self): - msg = self.getMessage() - cmdline = ['commit', '--message', msg] - files = self.stwidget.getChecked() - if files: - cmdline.extend(files) - else: - qtlib.WarningMsgBox(_('No files selected'), - _('No operation to perform'), - parent=self) + def addMessageToHistory(self): + umsg = self.msgte.toPlainText() + if not umsg:   return - # TODO: do something interesting here - print cmdline - umsg = self.msgte.toPlainText()   if umsg in self.msghistory:   self.msghistory.remove(umsg)   self.msghistory.insert(0, umsg)   self.msghistory = self.msghistory[:10] + self.msgcombo.reset(self.msghistory) + + def commit(self): + msg = self.getMessage() + if not msg: + qtlib.WarningMsgBox(_('Nothing Commited'), + _('Please enter commit message'), + parent=self) + self.msgte.setFocus() + return + files = self.stwidget.getChecked() + if not files: + qtlib.WarningMsgBox(_('No files selected'), + _('No operation to perform'), + parent=self) + self.stwidget.tv.setFocus() + return + cmdline = ['commit', '--message', msg] + files + # TODO: do something interesting here + print cmdline + self.addMessageToHistory()   self.msgte.clear()   self.msgte.document().setModified(False) - self.msgcombo.reset(self.msghistory)   self.emit(SIGNAL('commitComplete'))   return True   @@ -206,13 +219,12 @@
  commit.restoreState(s.value('commit/state').toByteArray())   self.restoreGeometry(s.value('commit/geom').toByteArray())   commit.loadConfigs(s) + commit.errorMessage.connect(self.errorMessage) + + name = hglib.get_reponame(commit.stwidget.repo) + self.setWindowTitle('%s - commit' % name)   self.commit = commit   - self.connect(self.commit, SIGNAL('errorMessage'), - self.errorMessage) - name = hglib.get_reponame(self.commit.stwidget.repo) - self.setWindowTitle('%s - commit' % name) -   def errorMessage(self, msg):   # TODO - add a status bar   print msg @@ -229,11 +241,7 @@
    def accept(self):   if self.commit.commit(): - s = QSettings() - s.setValue('commit/state', self.commit.saveState()) - s.setValue('commit/geom', self.saveGeometry()) - self.commit.storeConfigs(s) - QDialog.accept(self) + self.reject()     def reject(self):   if self.commit.canExit():