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

cmdui: rename Core.is_running() to Core.running()

Changeset c57ed19e569e…

Parent 8194c2df4148…

by Steve Borho

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

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​clone.py Stacked
 
195
196
197
198
 
199
200
201
 
195
196
197
 
198
199
200
201
@@ -195,7 +195,7 @@
  return 'startrev' in longopts     def clone(self): - if self.cmd.core.is_running(): + if self.cmd.core.running():   return   # prepare user input   srcQ = self.src_combo.currentText().trimmed()
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​cmdui.py Stacked
 
168
169
170
171
 
172
173
174
175
176
 
177
178
179
 
186
187
188
189
 
190
191
192
 
762
763
764
765
 
766
767
768
 
168
169
170
 
171
172
173
174
175
 
176
177
178
179
 
186
187
188
 
189
190
191
192
 
762
763
764
 
765
766
767
768
@@ -168,12 +168,12 @@
  self.queue.extend(cmdlines)   if self.useproc:   self.runproc() - elif not self.is_running(): + elif not self.running():   self.runNext()     def cancel(self):   '''Cancel running Mercurial command''' - if self.is_running(): + if self.running():   try:   if self.extproc:   self.extproc.close() @@ -186,7 +186,7 @@
  def setStbar(self, stbar):   self.stbar = stbar   - def is_running(self): + def running(self):   try:   if self.extproc:   return self.extproc.state() != QProcess.NotRunning @@ -762,7 +762,7 @@
  ### Private Method ###     def reject(self): - if self.core.is_running(): + if self.core.running():   ret = QMessageBox.question(self, _('Confirm Exit'), _('Mercurial'   ' command is still running.\nAre you sure you want'   ' to terminate?'), QMessageBox.Yes | QMessageBox.No,
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​quickop.py Stacked
 
140
141
142
143
 
144
145
146
 
140
141
142
 
143
144
145
146
@@ -140,7 +140,7 @@
  self.cmd.run(cmdline)     def reject(self): - if self.cmd.core.is_running(): + if self.cmd.core.running():   self.cmd.core.cancel()   else:   s = QSettings()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​serve.py Stacked
 
148
149
150
151
 
152
153
154
 
148
149
150
 
151
152
153
154
@@ -148,7 +148,7 @@
    def isstarted(self):   """Is the web server running?""" - return self._cmd.core.is_running() + return self._cmd.core.running()     @property   def rooturl(self):
Change 1 of 5 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
398
399
400
401
 
402
403
404
 
457
458
459
460
 
461
462
463
 
465
466
467
468
 
469
470
471
 
510
511
512
513
 
514
515
516
 
543
544
545
546
 
547
548
549
550
551
552
 
553
554
555
556
557
558
 
559
560
561
562
563
564
 
565
566
567
568
569
570
571
 
572
573
574
 
398
399
400
 
401
402
403
404
 
457
458
459
 
460
461
462
463
 
465
466
467
 
468
469
470
471
 
510
511
512
 
513
514
515
516
 
543
544
545
 
546
547
548
549
550
551
 
552
553
554
555
556
557
 
558
559
560
561
562
563
 
564
565
566
567
568
569
570
 
571
572
573
574
@@ -398,7 +398,7 @@
  return user, host, port, folder, passwd, scheme     def canExit(self): - return not self.cmd.core.is_running() + return not self.cmd.core.running()     @pyqtSlot(QPoint, QString, QString, bool)   def menuRequest(self, point, url, alias, editable): @@ -457,7 +457,7 @@
  if event.matches(QKeySequence.Refresh):   self.reload()   elif event.key() == Qt.Key_Escape: - if self.cmd.core.is_running(): + if self.cmd.core.running():   self.cmd.cancel()   elif not self.embedded:   self.close() @@ -465,7 +465,7 @@
  return super(SyncWidget, self).keyPressEvent(event)     def stopclicked(self): - if self.cmd.core.is_running(): + if self.cmd.core.running():   self.cmd.cancel()     def saveclicked(self): @@ -510,7 +510,7 @@
  self.finishfunc(ret, output)     def run(self, cmdline, details): - if self.cmd.core.is_running(): + if self.cmd.core.running():   return   for name in list(details) + ['remotecmd']:   val = self.opts.get(name) @@ -543,32 +543,32 @@
  ##     def incoming(self): - if self.cmd.core.is_running(): + if self.cmd.core.running():   self.showMessage.emit(_('sync command already running'))   else:   self.inclicked()     def pull(self): - if self.cmd.core.is_running(): + if self.cmd.core.running():   self.showMessage.emit(_('sync command already running'))   else:   self.pullclicked()     def outgoing(self): - if self.cmd.core.is_running(): + if self.cmd.core.running():   self.showMessage.emit(_('sync command already running'))   else:   self.outclicked()     def push(self): - if self.cmd.core.is_running(): + if self.cmd.core.running():   self.showMessage.emit(_('sync command already running'))   else:   self.pushclicked()     def pullBundle(self, bundle, rev):   'accept bundle changesets' - if self.cmd.core.is_running(): + if self.cmd.core.running():   self.output.emit(_('sync command already running'), 'control')   return   save = self.currentUrl(False)