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

cmdui: more CamelCase name changes

Changeset 8194c2df4148…

Parent c1fa6779ce32…

by Steve Borho

Changes to 2 files · Browse files at 8194c2df4148 Showing diff from parent c1fa6779ce32 Diff from another changeset...

Change 1 of 8 Show Entire File tortoisehg/​hgqt/​cmdui.py Stacked
 
169
170
171
172
 
173
174
175
 
183
184
185
186
 
187
188
189
 
256
257
258
259
 
260
261
262
 
264
265
266
267
 
268
269
270
271
272
273
274
 
275
276
277
 
285
286
287
288
 
289
290
291
292
293
294
295
 
296
297
298
 
312
313
314
315
 
316
317
318
 
668
669
670
671
 
672
673
674
 
721
722
723
724
 
725
726
727
 
169
170
171
 
172
173
174
175
 
183
184
185
 
186
187
188
189
 
256
257
258
 
259
260
261
262
 
264
265
266
 
267
268
269
270
271
272
273
 
274
275
276
277
 
285
286
287
 
288
289
290
291
292
293
294
 
295
296
297
298
 
312
313
314
 
315
316
317
318
 
668
669
670
 
671
672
673
674
 
721
722
723
 
724
725
726
727
@@ -169,7 +169,7 @@
  if self.useproc:   self.runproc()   elif not self.is_running(): - self.run_next() + self.runNext()     def cancel(self):   '''Cancel running Mercurial command''' @@ -183,7 +183,7 @@
  pass   self.commandCanceling.emit()   - def set_stbar(self, stbar): + def setStbar(self, stbar):   self.stbar = stbar     def is_running(self): @@ -256,7 +256,7 @@
  self.output.emit(hglib.tounicode(data), 'ui.error')     self.extproc = proc = QProcess(self) - proc.started.connect(self.command_started) + proc.started.connect(self.onCommandStarted)   proc.finished.connect(finished)   proc.readyReadStandardOutput.connect(stdout)   proc.readyReadStandardError.connect(stderr) @@ -264,14 +264,14 @@
  start(self.queue.pop(0), self.display)     - def run_next(self): + def runNext(self):   if not self.queue:   return False     cmdline = self.queue.pop(0)     self.thread = thread.CmdThread(cmdline, self.display, self.parent()) - self.thread.started.connect(self.command_started) + self.thread.started.connect(self.onCommandStarted)   self.thread.commandFinished.connect(self.threadFinished)     self.thread.outputReceived.connect(self.output) @@ -285,14 +285,14 @@
  self.thread.start()   return True   - def clear_output(self): + def clearOutput(self):   if self.internallog:   self.output_text.clear()     ### Signal Handlers ###     @pyqtSlot() - def command_started(self): + def onCommandStarted(self):   if self.stbar:   self.stbar.showMessage(_('Running...'))   @@ -312,7 +312,7 @@
  self.stbar.showMessage(status)     self.display = None - if ret == 0 and self.run_next(): + if ret == 0 and self.runNext():   return # run next command   else:   self.queue = [] @@ -668,7 +668,7 @@
  ## status and progress labels   self.stbar = ThgStatusBar()   self.stbar.setSizeGripEnabled(False) - self.core.set_stbar(self.stbar) + self.core.setStbar(self.stbar)   vbox.addWidget(self.stbar)     # widget setting @@ -721,7 +721,7 @@
  ## status and progress labels   self.stbar = ThgStatusBar()   self.stbar.setSizeGripEnabled(False) - self.core.set_stbar(self.stbar) + self.core.setStbar(self.stbar)   vbox.addWidget(self.stbar)     # bottom buttons
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
82
83
84
85
 
86
87
88
 
82
83
84
 
85
86
87
88
@@ -82,7 +82,7 @@
  if pane == MAIN_PANE:   self.ready()   elif pane == PERFORM_PANE: - self.cmd.core.clear_output() + self.cmd.core.clearOutput()   self.perform()   else:   raise 'unknown pane: %s' % pane