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

Merge with stable

Changeset eb0bbc341372…

Parents df6f8ccaac9f…

Parents 5febf29223f3…

by Steve Borho

Changes to 2 files · Browse files at eb0bbc341372 Showing diff from parent df6f8ccaac9f 5febf29223f3 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
551
552
553
554
 
555
556
557
 
551
552
553
 
554
555
556
557
@@ -551,7 +551,7 @@
  add(name, func)   return menu.exec_(point)   - if line < 0: + if line < 0 or line >= len(self.sci._links):   return menu.exec_(point)     fctx, line = self.sci._links[line]
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
63
64
65
66
 
67
68
69
 
207
208
209
210
211
212
 
 
213
214
215
 
601
602
603
604
 
 
605
606
607
 
780
781
782
783
 
784
785
786
 
787
788
789
 
63
64
65
 
66
67
68
69
 
207
208
209
 
 
 
210
211
212
213
214
 
600
601
602
 
603
604
605
606
607
 
780
781
782
 
783
784
785
 
786
787
788
789
@@ -63,7 +63,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.busyIcons = [] @@ -207,9 +207,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   @@ -601,7 +600,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) @@ -780,10 +780,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: