Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

Merge with stable

Changeset 741eceb05c9e…

Parents 6cc24ab367f5…

Parents 1e86a65248c8…

by Steve Borho

Changes to 2 files · Browse files at 741eceb05c9e Showing diff from parent 6cc24ab367f5 1e86a65248c8 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
329
330
331
332
 
333
334
335
 
353
354
355
356
 
357
358
359
 
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
 
748
749
750
 
329
330
331
 
332
333
334
335
 
353
354
355
 
356
357
358
359
 
728
729
730
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
731
732
733
734
@@ -329,7 +329,7 @@
    sob, eob = buf.get_bounds()   pos = buf.get_iter_at_offset(offset) - buf.apply_tag_by_name('mono', pos, eob) + buf.apply_tag_by_name('diff', pos, eob)   return True     def append_patch_diff(self, patchfile): @@ -353,7 +353,7 @@
    sob, eob = buf.get_bounds()   pos = buf.get_iter_at_offset(offset) - buf.apply_tag_by_name('mono', pos, eob) + buf.apply_tag_by_name('diff', pos, eob)     def append_all_patch_diffs(self):   model = self._filelist @@ -728,23 +728,7 @@
    tag_table = self._buffer.get_tag_table()   - tag_table.add(make_texttag('changeset', foreground='#000090', - paragraph_background='#F0F0F0')) - tag_table.add(make_texttag('changeset-summary', foreground='black', - paragraph_background='#F0F0F0', family='Sans')) - tag_table.add(make_texttag('date', foreground='#000090', - paragraph_background='#F0F0F0')) - tag_table.add(make_texttag('tag', foreground='#000090', - paragraph_background='#F0F0F0')) - tag_table.add(make_texttag('files', foreground='#5C5C5C', - paragraph_background='#F0F0F0')) - tag_table.add(make_texttag('parent', foreground='#000090', - paragraph_background='#F0F0F0')) - tag_table.add(make_texttag('parenthl', foreground='#000090', - paragraph_background='#F0F0F0', - weight=pango.WEIGHT_BOLD )) - - tag_table.add(make_texttag('mono', family='Monospace')) + tag_table.add(make_texttag('diff', font=self.fontdiff))   tag_table.add(make_texttag('blue', foreground='blue'))   tag_table.add(make_texttag('red', foreground='red'))   tag_table.add(make_texttag('green', foreground='darkgreen'))
Change 1 of 4 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
96
97
98
99
100
 
 
 
 
 
 
 
 
 
 
 
 
101
102
103
 
427
428
429
 
 
 
 
 
 
 
 
 
430
431
432
433
434
435
436
 
 
 
 
 
 
 
 
 
 
 
437
438
439
 
1097
1098
1099
 
1100
1101
1102
 
1110
1111
1112
 
1113
1114
1115
 
96
97
98
 
 
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
 
437
438
439
440
441
442
443
444
445
446
447
448
449
450
 
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
 
1126
1127
1128
1129
1130
1131
1132
 
1140
1141
1142
1143
1144
1145
1146
@@ -96,8 +96,18 @@
  self.filtercombo.set_active(self.filter_mode)   self.append_widget(self.filtercombo, padding=0)   - self.entry = gtk.Entry() - self.append_widget(self.entry, expand=True, padding=0) + searchlist = gtk.ListStore(int, # filtercombo value + str, # search string (utf-8) + str) # mode string (utf-8) + entrycombo = gtk.ComboBoxEntry(searchlist, 1) + cell = gtk.CellRendererText() + entrycombo.pack_end(cell, False) + entrycombo.add_attribute(cell, 'text', 2) + entry = entrycombo.child + self.entrycombo = entrycombo + self.entry = entry + self.append_widget(entrycombo, expand=True, padding=0) +     def connect(self, detailed_signal, handler, *opts):   '''Connect an external signal handler to an internal widget @@ -427,13 +437,32 @@
  if reload:   self.reload_log()   + def filter_entry_changed(self, entrycombo, filtercombo): + row = entrycombo.get_active() + if row < 0: + return + mode, text, display = entrycombo.get_model()[row] + filtercombo.set_active(mode) + entrycombo.child.set_text(text) + self.activate_filter(text, mode) +   def filter_entry_activated(self, entry, combo):   'User pressed enter in the filter entry' - opts = {}   mode = combo.get_active()   text = entry.get_text()   if not text:   return + row = [mode, text, combo.get_active_text()] + model = self.entrycombo.get_model() + for r in model: + if r[0] == row[0] and r[1] == row[1]: + break + else: + self.entrycombo.get_model().append( row ) + self.activate_filter(text, mode) + + def activate_filter(self, text, mode): + opts = {}   if mode == 0: # Rev Range   try:   opts['revlist'] = cmdutil.revrange(self.repo, [text]) @@ -1097,6 +1126,7 @@
  self.filter_mode = filterbox.filter_mode   self.filtercombo = filterbox.filtercombo   self.filterentry = filterbox.entry + self.entrycombo = filterbox.entrycombo     fcon = self.filterbox.connect   fsel = self.filter_selected @@ -1110,6 +1140,7 @@
  fcon('branches_toggled', fsel, 'branch')   fcon('branchcombo_changed', self.select_branch)   fcon('entry_activate', self.filter_entry_activated, self.filtercombo) + fcon('entrycombo_changed', self.filter_entry_changed, self.filtercombo)     midpane = gtk.VBox()   midpane.pack_start(syncbox, False)