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

stable repowidget: clarify that self.branch is a QString (fixes #542)

Changeset 5febf29223f3…

Parent c69ddedf0b25…

by Steve Borho

Changes to one file · Browse files at 5febf29223f3 Showing diff from parent c69ddedf0b25 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
61
62
63
64
 
65
66
67
 
199
200
201
202
203
204
 
 
205
206
207
 
576
577
578
579
 
 
580
581
582
 
755
756
757
758
 
759
760
761
 
762
763
764
 
61
62
63
 
64
65
66
67
 
199
200
201
 
 
 
202
203
204
205
206
 
575
576
577
 
578
579
580
581
582
 
755
756
757
 
758
759
760
 
761
762
763
764
@@ -61,7 +61,7 @@
  repo.repositoryDestroyed.connect(self.repositoryDestroyed)   repo.configChanged.connect(self.configChanged)   self.revsetfilter = False - self.branch = '' + self.ubranch = u''   self.bundle = None   self.revset = []   self.namedTabs = {} @@ -199,9 +199,8 @@
  """Returns the expected title for this widget [unicode]"""   if self.bundle:   return _('%s <incoming>') % self.repo.shortname - elif self.branch: - return u'%s [%s]' % (self.repo.shortname, - hglib.tounicode(self.branch)) + elif self.ubranch: + return u'%s [%s]' % (self.repo.shortname, self.ubranch)   else:   return self.repo.shortname   @@ -576,7 +575,8 @@
  def setupModels(self):   # Filter revision set in case revisions were removed   self.revset = [r for r in self.revset if r < len(self.repo)] - self.repomodel = HgRepoListModel(self.repo, self.branch, self.revset, + branch = hglib.fromunicode(self.ubranch) + self.repomodel = HgRepoListModel(self.repo, branch, self.revset,   self.revsetfilter, self)   self.repomodel.filled.connect(self.modelFilled)   self.repomodel.loaded.connect(self.modelLoaded) @@ -755,10 +755,10 @@
  else:   self.taskTabsWidget.tabBar().hide()   - @pyqtSlot(unicode, bool) + @pyqtSlot(QString, bool)   def setBranch(self, branch, allparents=True):   'Change the branch filter' - self.branch = branch + self.ubranch = branch   self.repomodel.setBranch(branch=branch, allparents=allparents)   self.titleChanged.emit(self.title())   if self.revset: