Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph

Merge with stable

Changeset f0179326f34e…

Parents c25b4666832b…

Parents 8d636040d1a4…

by Adrian Buehlmann

Changes to 3 files · Browse files at f0179326f34e Showing diff from parent c25b4666832b 8d636040d1a4 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
541
542
543
544
 
 
545
546
547
 
541
542
543
 
544
545
546
547
548
@@ -541,7 +541,8 @@
  dlg.setSearchPattern(opts['pattern'])   if dlg._manifest_widget._fileview.actionAnnMode.isEnabled():   dlg._manifest_widget._fileview.actionAnnMode.trigger() - dlg.setSearchCaseInsensitive(opts['ignorecase']) + if 'ignorecase' in opts: + dlg.setSearchCaseInsensitive(opts['ignorecase'])   except IndexError:   pass   dlg.setSearchPattern(hglib.tounicode(opts.get('pattern')) or '')
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repoview.py Stacked
 
279
280
281
 
 
 
282
283
284
 
279
280
281
282
283
284
285
286
287
@@ -279,6 +279,9 @@
  else:   idx = self.model().indexFromRev(rev)   if idx is not None: + # avoid unwanted selection change (#1019) + if self.currentIndex().row() != idx.row(): + self.setCurrentIndex(idx)   self.scrollTo(idx)     def saveSettings(self, s = None):
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
336
337
338
339
 
 
340
341
342
 
871
872
873
874
 
875
876
877
 
336
337
338
 
339
340
341
342
343
 
872
873
874
 
875
876
877
878
@@ -336,7 +336,8 @@
  if status in 'MAR!':   self.actions.allactions[0].trigger()   elif status == 'S': - self.linkActivated.emit(u'subrepo:'+hglib.tounicode(path)) + self.linkActivated.emit( + u'subrepo:' + hglib.tounicode(self.repo.wjoin(path)))     @pyqtSlot(QString)   def setFilter(self, match): @@ -871,7 +872,7 @@
  assert util.all(c in self._TYPES for c in text)   for c in self._TYPES:   self._actions[c].setChecked(c in text) - +  class StatusDialog(QDialog):   'Standalone status browser'   def __init__(self, repo, pats, opts, parent=None):