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

stable commit: fix tortoisehg.closeci, start progress bar before commit command

Changeset 8ec7e859f905…

Parent 04ec7eb8e9f2…

by Steve Borho

Changes to one file · Browse files at 8ec7e859f905 Showing diff from parent 04ec7eb8e9f2 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
597
598
599
 
600
601
602
603
604
605
606
 
961
962
963
964
965
 
 
 
 
 
966
967
968
 
597
598
599
600
601
602
603
 
604
605
606
 
961
962
963
 
 
964
965
966
967
968
969
970
971
@@ -597,10 +597,10 @@
  commandlines.append(cmd)     repo.incrementBusyCount() + self.progress.emit(*cmdui.startProgress(_('Commit', 'start progress'), ''))   self.commitButtonEnable.emit(False)   self.runner.run(*commandlines)   self.stopAction.setEnabled(True) - self.progress.emit(*cmdui.startProgress(_('Commit', 'start progress'), ''))     def stop(self):   self.runner.cancel() @@ -961,8 +961,11 @@
  def postcommit(self):   repo = self.commit.stwidget.repo   if repo.ui.configbool('tortoisehg', 'closeci'): - self.reject() - return + if self.commit.canExit(): + self.reject() + else: + self.commit.stwidget.refthread.wait() + QTimer.singleShot(0, self.reject)     def accept(self):   self.commit.commit()