Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 0865a2485b59…

Parents f94b4fa7d9ef…

Parents b8d1fbd7634a…

by Steve Borho

Changes to 2 files · Browse files at 0865a2485b59 Showing diff from parent f94b4fa7d9ef b8d1fbd7634a Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
218
219
220
 
 
 
 
 
221
222
223
 
609
610
611
 
612
 
 
 
 
613
614
 
 
615
616
617
 
218
219
220
221
222
223
224
225
226
227
228
 
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
@@ -218,6 +218,11 @@
  self.branchop = None     tbar.addAction(_('Options')).triggered.connect(self.details) + tbar.setIconSize(QSize(16,16)) + self.stopAction = tbar.addAction(_('Stop')) + self.stopAction.triggered.connect(self.stop) + self.stopAction.setIcon(qtlib.geticon('process-stop')) + self.stopAction.setEnabled(False)     hbox.addStretch(1)   @@ -609,9 +614,16 @@
  commandlines.append(cmd)     repo.incrementBusyCount() + self.commitButtonEnable.emit(False)   self.runner.run(*commandlines) + self.stopAction.setEnabled(True) + + def stop(self): + self.runner.cancel()     def commandFinished(self, ret): + self.stopAction.setEnabled(False) + self.commitButtonEnable.emit(True)   self.repo.decrementBusyCount()   if ret == 0:   umsg = self.msgte.text()
Show Entire File tortoisehg/​hgqt/​status.py Stacked
(No changes)