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

stable Backed out changeset: de6b1d7dda9e

I do not like the behavior when there are errors

Changeset 5f3e4d3631de…

Parent 08177bd3bb2e…

by Steve Borho

Changes to one file · Browse files at 5f3e4d3631de Showing diff from parent 08177bd3bb2e Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
107
108
109
110
111
112
113
114
 
115
116
117
118
119
120
 
121
122
123
 
288
289
290
291
 
292
293
294
 
107
108
109
 
 
 
 
 
110
111
112
113
114
115
116
117
118
119
120
 
285
286
287
 
288
289
290
291
@@ -107,17 +107,14 @@
  repo.ui.configbool('tortoisehg', 'autoresolve', False))     ## command widget - if self.parent: - self.cmd = cmdui.Runner(_('TortoiseHg Update'), False, self) - else: - self.cmd = cmdui.Widget(True, self) - box.addWidget(self.cmd) + self.cmd = cmdui.Widget()   self.cmd.commandStarted.connect(self.command_started)   self.cmd.commandFinished.connect(self.command_finished)   self.cmd.commandCanceling.connect(self.command_canceling)   self.cmd.output.connect(self.output)   self.cmd.makeLogVisible.connect(self.makeLogVisible)   self.cmd.progress.connect(self.progress) + box.addWidget(self.cmd)     ## bottom buttons   buttons = QDialogButtonBox() @@ -288,7 +285,7 @@
  self.update_btn.setHidden(True)   self.close_btn.setHidden(True)   self.cancel_btn.setShown(True) - self.detail_btn.setShown(not self.parent()) + self.detail_btn.setShown(True)     def command_finished(self, ret):   self.repo.decrementBusyCount()