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

annotate: keep reference to grep instance that opened it

Changeset da691fb3a687…

Parent 05429fe6e5ce…

by Steve Borho

Changes to 2 files · Browse files at da691fb3a687 Showing diff from parent 05429fe6e5ce Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​annotate.py Stacked
 
329
330
331
332
 
333
334
335
 
367
368
369
370
 
371
372
373
 
414
415
416
 
417
418
419
 
420
421
422
423
 
424
425
426
 
427
428
429
430
 
431
432
433
 
434
435
436
 
329
330
331
 
332
333
334
335
 
367
368
369
 
370
371
372
373
 
414
415
416
417
418
419
 
420
421
422
423
424
425
426
427
 
428
429
430
431
432
433
434
435
 
436
437
438
439
@@ -329,7 +329,7 @@
   class AnnotateDialog(QDialog):   def __init__(self, *pats, **opts): - super(AnnotateDialog,self).__init__(opts.get('parent')) + super(AnnotateDialog,self).__init__(opts.get('parent'), Qt.Window)     mainvbox = QVBoxLayout()   self.setLayout(mainvbox) @@ -367,7 +367,7 @@
  self.connect(av, SIGNAL('searchAnnotation'), self.searchAnnotation)     self.status = status - self.searchwidget = None + self.searchwidget = opts.get('searchwidget')     self.opts = opts   line = opts.get('line') @@ -414,23 +414,26 @@
  def searchAtRev(self, args):   if self.searchwidget is None:   self.searchwidget = SearchWidget([args[0]], rev=args[1]) + self.searchwidget.show()   else:   self.searchwidget.setSearch(args[0], rev=args[1]) - self.searchwidget.show() + self.searchwidget.raise_()     def searchAtParent(self, pattern):   if self.searchwidget is None:   self.searchwidget = SearchWidget([pattern], rev='.') + self.searchwidget.show()   else:   self.searchwidget.setSearch(pattern, rev='.') - self.searchwidget.show() + self.searchwidget.raise_()     def searchAll(self, pattern):   if self.searchwidget is None:   self.searchwidget = SearchWidget([pattern], all=True) + self.searchwidget.show()   else:   self.searchwidget.setSearch(pattern, all=True) - self.searchwidget.show() + self.searchwidget.raise_()     def searchAnnotation(self, pattern):   self.le.setText(QRegExp.escape(pattern))
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​grep.py Stacked
 
350
351
352
 
353
354
355
 
429
430
431
432
 
 
433
434
435
 
350
351
352
353
354
355
356
 
430
431
432
 
433
434
435
436
437
@@ -350,6 +350,7 @@
  self.connect(self, SIGNAL('customContextMenuRequested(const QPoint &)'),   self.customContextMenuRequested)   self.pattern = None + self.searchwidget = parent     def dragObject(self):   snapshots = {} @@ -429,7 +430,8 @@
  else:   seen.add(path)   dlg = annotate.AnnotateDialog(path, rev=rev, line=line, - pattern=pattern, parent=self) + pattern=pattern, parent=self, + searchwidget=self.searchwidget)   dlg.show()     def ctx(self, rows):