/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: 2007-02-01 15:50:40 UTC
  • Revision ID: jelmer@samba.org-20070201155040-3hq4mfbxs99kzazy
add framework for tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/gannotate.py
28
28
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
29
29
 
30
30
from colormap import AnnotateColorMap, AnnotateColorSaturation
31
 
from bzrlib.plugins.gtk.logview import LogView
 
31
from logview import LogView
 
32
from spanselector import SpanSelector
32
33
 
33
34
 
34
35
(
139
140
        current_revision.timestamp = time.time()
140
141
        current_revision.message = '[Not yet committed]'
141
142
        current_revision.parent_ids = tree.get_parent_ids()
142
 
        current_revision.properties['branch-nick'] = self.branch.nick
143
143
        current_revno = '%d?' % (self.branch.revno() + 1)
144
144
        repository = self.branch.repository
145
145
        if self.revision_id == CURRENT_REVISION:
244
244
                tree2 = repository.revision_tree(revision.parent_ids[0])
245
245
            else:
246
246
                tree2 = repository.revision_tree(NULL_REVISION)
247
 
        from bzrlib.plugins.gtk.diff import DiffWindow
 
247
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
248
248
        window = DiffWindow()
249
249
        window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
250
250
        window.set_file(tree1.id2path(self.file_id))
312
312
    def _create_log_view(self):
313
313
        lv = LogView()
314
314
        lv.show()
 
315
 
315
316
        return lv
316
317
 
317
318
    def _create_button_box(self):
370
371
    For when a revision is referenced but not present.
371
372
    """
372
373
 
373
 
    def __init__(self, revision_id, committer='?', nick=None):
 
374
    def __init__(self, revision_id, committer='?'):
374
375
        self.revision_id = revision_id
375
376
        self.parent_ids = []
376
377
        self.committer = committer
377
378
        self.message = "?"
378
379
        self.timestamp = 0.0
379
380
        self.timezone = 0
380
 
        self.properties = {}
381
381
 
382
382
 
383
383
class RevisionCache(object):