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

stable status: handle errors more cleanly

* the progress bar was left running
* the refreshing flag was not cleared (preventing further refresh attempts)
* wctx and ms did not need to be member variables

Changeset ce654e36885a…

Parent 2de46fd147d0…

by Steve Borho

Changes to one file · Browse files at ce654e36885a Showing diff from parent 2de46fd147d0 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
57
58
59
60
61
62
63
64
65
66
67
68
 
232
233
234
235
236
237
238
 
239
240
241
 
 
242
243
244
 
245
246
247
 
251
252
253
254
 
 
255
256
257
 
258
259
260
 
295
296
297
298
299
300
301
302
303
 
57
58
59
 
60
61
62
63
 
64
65
66
 
230
231
232
 
 
 
 
233
234
 
 
235
236
237
238
 
239
240
241
242
 
246
247
248
 
249
250
251
252
 
253
254
255
256
 
291
292
293
 
 
 
294
295
296
@@ -57,12 +57,10 @@
  root = paths.find_root(root)   assert(root)   self.repo = thgrepo.repository(ui.ui(), path=root) - self.wctx = self.repo[None]   self.opts = dict(modified=True, added=True, removed=True, deleted=True,   unknown=True, clean=False, ignored=False, subrepo=True)   self.opts.update(opts)   self.pats = pats - self.ms = {}   self.patchecked = {}   self.refreshing = None   @@ -232,16 +230,13 @@
  self.allbutton.setEnabled(True)   self.nonebutton.setEnabled(True)   self.refreshBtn.setEnabled(True) - if self.refreshing.wctx is None: - return - self.ms = merge.mergestate(self.repo) - self.wctx = self.refreshing.wctx + self.progress.emit(*cmdui.stopProgress(_('Refresh')))   self.patchecked = self.refreshing.patchecked - self.updateModel() - self.progress.emit(*cmdui.stopProgress(_('Refresh'))) + if self.refreshing.wctx is not None: + self.updateModel(self.refreshing.wctx)   self.refreshing = None   - def updateModel(self): + def updateModel(self, wctx):   self.tv.setSortingEnabled(False)   if self.tv.model():   checked = self.tv.model().getChecked() @@ -251,10 +246,11 @@
  qtlib.WarningMsgBox(_('No appropriate files'),   _('No files found for this operation'),   parent=self) - tm = WctxModel(self.wctx, self.ms, self.opts, checked, self) + ms = merge.mergestate(self.repo) + tm = WctxModel(wctx, ms, self.opts, checked, self)   self.tv.setModel(tm)   self.tv.setSortingEnabled(True) - self.tv.setColumnHidden(COL_PATH, self.isMerge()) + self.tv.setColumnHidden(COL_PATH, bool(wctx.p2()))   self.tv.setColumnHidden(COL_MERGE_STATE, not tm.anyMerge())     for col in (COL_PATH, COL_STATUS, COL_MERGE_STATE): @@ -295,9 +291,6 @@
  def checkNone(self):   self.tv.model().checkAll(False)   - def isMerge(self): - return bool(self.wctx.p2()) -   def getChecked(self, types=None):   model = self.tv.model()   if model: