/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to annotate/gannotate.py

  • Committer: Jelmer Vernooij
  • Date: 2008-03-14 02:19:21 UTC
  • mto: (452.2.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 453.
  • Revision ID: jelmer@samba.org-20080314021921-2dgptk62dhp7pd91
Honor child_submit_to in the submit_branch if no email address was specified.
Consistent with the changes in bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/gannotate.py
45
45
class GAnnotateWindow(Window):
46
46
    """Annotate window."""
47
47
 
48
 
    def __init__(self, all=False, plain=False, parent=None, branch=None):
 
48
    def __init__(self, all=False, plain=False, parent=None):
49
49
        self.all = all
50
50
        self.plain = plain
51
 
        self._branch = branch
52
51
        
53
52
        Window.__init__(self, parent)
54
53
        
91
90
                    revno = author = ""
92
91
                else:
93
92
                    last_seen = revision.revision_id
94
 
                    author = ", ".join(revision.get_apparent_authors())
 
93
                    author = revision.get_apparent_author()
95
94
 
96
95
                if revision.revision_id not in self.revisions:
97
96
                    self.revisions[revision.revision_id] = revision
139
138
        current_revision.timestamp = time.time()
140
139
        current_revision.message = '[Not yet committed]'
141
140
        current_revision.parent_ids = tree.get_parent_ids()
142
 
        current_revision.properties['branch-nick'] = self.branch._get_nick(local=True)
 
141
        current_revision.properties['branch-nick'] = self.branch.nick
143
142
        current_revno = '%d?' % (self.branch.revno() + 1)
144
143
        repository = self.branch.repository
145
144
        if self.revision_id == CURRENT_REVISION:
178
177
 
179
178
    def _activate_selected_revision(self, w):
180
179
        rev_id = self._selected_revision()
181
 
        if not rev_id or rev_id == NULL_REVISION:
 
180
        if rev_id is None:
182
181
            return
183
182
        selected = self.revisions[rev_id]
184
183
        self.revisionview.set_revision(selected)
212
211
        hbox.pack_start(self.back_button, expand=False, fill=True)
213
212
        self.forward_button = self._create_forward_button()
214
213
        hbox.pack_start(self.forward_button, expand=False, fill=True)
215
 
        self.find_button = self._create_find_button()
216
 
        hbox.pack_start(self.find_button, expand=False, fill=True)
217
 
        self.goto_button = self._create_goto_button()
218
 
        hbox.pack_start(self.goto_button, expand=False, fill=True)
219
214
        hbox.show()
220
215
        vbox.pack_start(hbox, expand=False, fill=True)
221
216
        
238
233
 
239
234
        self.add(vbox)
240
235
 
241
 
    def _search_by_text(self, *ignored): # (accel_group, window, key, modifiers):
 
236
    def _search_by_text(self, accel_group, window, key, modifiers):
242
237
        self._search.show_for('text')
243
238
        self._search.set_target(self.annoview, TEXT_LINE_COL)
244
239
 
245
 
    def _search_by_line(self, *ignored): # accel_group, window, key, modifiers):
 
240
    def _search_by_line(self, accel_group, window, key, modifiers):
246
241
        self._search.show_for('line')
247
242
        self._search.set_target(self.annoview, LINE_NUM_COL)
248
243
 
325
320
        return tv
326
321
 
327
322
    def _create_log_view(self):
328
 
        lv = RevisionView(self._branch)
 
323
        lv = RevisionView()
329
324
        lv.show()
330
325
        return lv
331
326
 
348
343
        button.set_sensitive(False)
349
344
        return button
350
345
 
351
 
    def _create_find_button(self):
352
 
        button = gtk.Button()
353
 
        button.set_use_stock(True)
354
 
        button.set_label("gtk-find")
355
 
        button.set_tooltip_text("Search for text (Ctrl+F)")
356
 
        button.connect("clicked", self._search_by_text)
357
 
        button.set_relief(gtk.RELIEF_NONE)
358
 
        button.show()
359
 
        button.set_sensitive(True)
360
 
        return button
361
 
 
362
 
    def _create_goto_button(self):
363
 
        button = gtk.Button()
364
 
        button.set_label("Goto Line")
365
 
        button.set_tooltip_text("Scroll to a line by entering its number (Ctrl+G)")
366
 
        button.connect("clicked", self._search_by_line)
367
 
        button.set_relief(gtk.RELIEF_NONE)
368
 
        button.show()
369
 
        button.set_sensitive(True)
370
 
        return button
371
 
 
372
346
    def go_back(self):
373
347
        last_tree = self.tree
374
348
        rev_id = self._selected_revision()
414
388
                return j - i
415
389
 
416
390
 
417
 
class FakeRevision(object):
 
391
class FakeRevision:
418
392
    """ A fake revision.
419
393
 
420
394
    For when a revision is referenced but not present.
429
403
        self.timezone = 0
430
404
        self.properties = {}
431
405
 
432
 
    def get_apparent_authors(self):
433
 
        return [self.committer]
 
406
    def get_apparent_author(self):
 
407
        return self.committer
434
408
 
435
409
 
436
410
class RevisionCache(object):
437
411
    """A caching revision source"""
438
 
 
439
412
    def __init__(self, real_source, seed_cache=None):
440
413
        self.__real_source = real_source
441
414
        if seed_cache is None: