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

workbench: get branchcombo working again

Changeset 4e26c3d6340c…

Parent 63cc8738fd93…

by Adrian Buehlmann

Changes to 2 files · Browse files at 4e26c3d6340c Showing diff from parent 63cc8738fd93 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
199
200
201
202
203
204
205
206
 
207
208
209
210
211
212
213
 
214
215
216
 
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
 
396
397
398
399
400
401
 
 
402
403
404
 
199
200
201
 
 
 
 
 
202
203
204
 
 
 
 
 
205
206
207
208
 
370
371
372
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
373
374
 
 
 
 
 
375
376
377
378
379
@@ -199,18 +199,10 @@
  self.addAction(self.actionClearStartAtRev)     def startAtCurrentRev(self): - crev = self.repoview.current_rev - if crev: - self.startrev_entry.setText(str(crev)) - # XXX workaround: see refreshRevisionTable method - self.refreshRevisionTable(sender=self) + pass     def clearStartAtRev(self): - self.startrev_entry.setText("") - self._reload_rev = self.repoview.current_rev - self._reload_file = self.tableView_filelist.currentFile() - # XXX workaround: see refreshRevisionTable method - self.refreshRevisionTable(sender=self) + pass     def setMode(self, mode):   self.fileview.setMode(mode) @@ -378,27 +370,10 @@
  self.setupBranchCombo()   self.setupModels()   - #@timeit - def refreshRevisionTable(self, *args, **kw): - """Starts the process of filling the HgModel""" - branch = self.branch_comboBox.currentText() - branch = str(branch) - startrev = str(self.startrev_entry.text()).strip() - if not startrev: - startrev = None - # XXX workaround: self.sender() may provoque a core dump if - # this method is called directly (not via a connected signal); - # the 'sender' keyword is a way to discrimimne that the method - # has been called directly (thus caller MUST set this kw arg) - sender = kw.get('sender') or self.sender() - if sender is self.startrev_follow_action and startrev is None: - return + def setRepomodel(self, branch, startrev, follow):   startrev = self.repo.changectx(startrev).rev() - follow = self.startrev_follow_action.isChecked() - self.revscompl_model.setStringList(self.repo.tags().keys()) - - self.repomodel.setRepo(self.repo, branch=branch, fromhead=startrev, - follow=follow) + self.repomodel.setRepo( + self.repo, branch=branch, fromhead=startrev, follow=follow)     def okToContinue(self):   '''
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
402
403
404
405
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
406
407
408
 
402
403
404
 
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
@@ -402,7 +402,24 @@
    #@timeit   def refreshRevisionTable(self, *args, **kw): - pass + """Starts the process of filling the HgModel""" + branch = self.branch_comboBox.currentText() + branch = str(branch) + startrev = str(self.startrev_entry.text()).strip() + if not startrev: + startrev = None + # XXX workaround: self.sender() may provoke a core dump if + # this method is called directly (not via a connected signal); + # the 'sender' keyword is a way to discrimimne that the method + # has been called directly (thus caller MUST set this kw arg) + sender = kw.get('sender') or self.sender() + if sender is self.startrev_follow_action and startrev is None: + return + follow = self.startrev_follow_action.isChecked() + w = self.repoTabsWidget.currentWidget() + if w: + self.revscompl_model.setStringList(w.repo.tags().keys()) + w.setRepomodel(branch, startrev, follow)     def on_about(self, *args):   """ Display about dialog """