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

stable manifestdialog: set ignorecase during init, fixes highlighting on Annotate File in search

Changeset 243a38c529df…

Parent 81f553f7033b…

by Andrea Stagi

Changes to 2 files · Browse files at 243a38c529df Showing diff from parent 81f553f7033b Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​grep.py Stacked
 
288
289
290
 
291
292
293
 
525
526
527
 
528
529
530
 
627
628
629
630
 
631
632
633
 
644
645
646
647
 
648
649
650
 
652
653
654
655
 
656
657
658
 
288
289
290
291
292
293
294
 
526
527
528
529
530
531
532
 
629
630
631
 
632
633
634
635
 
646
647
648
 
649
650
651
652
 
654
655
656
 
657
658
659
660
@@ -288,6 +288,7 @@
    self.tv.setSortingEnabled(False)   self.tv.pattern = pattern + self.tv.icase = icase   self.regexple.selectAll()   inc = hglib.fromunicode(self.incle.text())   if inc: inc = inc.split(', ') @@ -525,6 +526,7 @@
    self.repo = repo   self.pattern = None + self.icase = False   self.embedded = parent.parent() is not None   self.selectedRows = ()   @@ -627,7 +629,7 @@
  def onAnnotateFile(self):   from tortoisehg.hgqt.manifestdialog import run   from tortoisehg.hgqt.run import qtrun - repo, ui, pattern = self.repo, self.repo.ui, self.pattern + repo, ui, pattern, icase = self.repo, self.repo.ui, self.pattern, self.icase   seen = set()   for rev, path, line in self.selectedRows:   # Only open one annotate instance per file @@ -644,7 +646,7 @@
  rev = repo['.'].rev()   srepo = thgrepo.repository(None, root)   opts = {'repo': srepo, 'canonpath' : path, 'rev' : rev, - 'line': line, 'pattern': pattern} + 'line': line, 'pattern': pattern, 'ignorecase': icase}   qtrun(run, ui, **opts)   else:   continue @@ -652,7 +654,7 @@
  if rev is None:   rev = repo['.'].rev()   opts = {'repo': repo, 'canonpath' : path, 'rev' : rev, - 'line': line, 'pattern': pattern} + 'line': line, 'pattern': pattern, 'ignorecase': icase}   qtrun(run, ui, **opts)     def onViewChangeset(self):
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
79
80
81
 
 
 
 
82
83
84
 
537
538
539
 
540
541
542
 
79
80
81
82
83
84
85
86
87
88
 
541
542
543
544
545
546
547
@@ -79,6 +79,10 @@
  """Set search pattern [unicode]"""   self._manifest_widget._fileview.searchbar.setPattern(text)   + def setSearchCaseInsensitive(self, ignorecase): + """Set if search is case insensitive""" + self._manifest_widget._fileview.searchbar.setCaseInsensitive(ignorecase) +   @pyqtSlot(unicode, dict)   def _openSearchWidget(self, pattern, opts):   opts = dict((str(k), str(v)) for k, v in opts.iteritems()) @@ -537,6 +541,7 @@
  dlg.setSearchPattern(opts['pattern'])   if dlg._manifest_widget._fileview.actionAnnMode.isEnabled():   dlg._manifest_widget._fileview.actionAnnMode.trigger() + dlg.setSearchCaseInsensitive(opts['ignorecase'])   except IndexError:   pass   dlg.setSearchPattern(hglib.tounicode(opts.get('pattern')) or '')