/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
0.1.1 by Dan Loda
First working version of xannotate.
1
# Copyright (C) 2005 Dan Loda <danloda@gmail.com>
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
0.2.1 by Dan Loda
first go at emacs vc-annotate like highlighting
17
import time
18
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
19
from gi.repository import GObject
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
20
from gi.repository import Gdk
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
21
from gi.repository import Gtk
22
from gi.repository import Pango
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
23
import re
0.1.1 by Dan Loda
First working version of xannotate.
24
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
25
from bzrlib import patiencediff
0.1.1 by Dan Loda
First working version of xannotate.
26
from bzrlib.errors import NoSuchRevision
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
27
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
0.1.1 by Dan Loda
First working version of xannotate.
28
724 by Jelmer Vernooij
Fix formatting, imports.
29
from bzrlib.plugins.gtk.annotate.colormap import AnnotateColorSaturation
782.1.1 by Curtis Hovey
Create the mnemonic for the button label.
30
from bzrlib.plugins.gtk.i18n import _i18n
330.3.1 by Daniel Schierbeck
Renamed logview 'revisionview'.
31
from bzrlib.plugins.gtk.revisionview import RevisionView
298.2.1 by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events.
32
from bzrlib.plugins.gtk.window import Window
0.1.1 by Dan Loda
First working version of xannotate.
33
34
35
(
36
    REVISION_ID_COL,
37
    LINE_NUM_COL,
38
    COMMITTER_COL,
39
    REVNO_COL,
0.2.1 by Dan Loda
first go at emacs vc-annotate like highlighting
40
    HIGHLIGHT_COLOR_COL,
0.1.1 by Dan Loda
First working version of xannotate.
41
    TEXT_LINE_COL
0.2.1 by Dan Loda
first go at emacs vc-annotate like highlighting
42
) = range(6)
0.1.1 by Dan Loda
First working version of xannotate.
43
44
298.2.1 by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events.
45
class GAnnotateWindow(Window):
0.1.1 by Dan Loda
First working version of xannotate.
46
    """Annotate window."""
47
473.1.1 by Andrew Bennetts
Simple hack to fix gannotate.
48
    def __init__(self, all=False, plain=False, parent=None, branch=None):
0.2.6 by Dan Loda
--plain option to disable highlighting. And update README
49
        self.all = all
50
        self.plain = plain
473.1.1 by Andrew Bennetts
Simple hack to fix gannotate.
51
        self._branch = branch
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
52
734.1.51 by Curtis Hovey
Fix the initializer for many classes.
53
        super(GAnnotateWindow, self).__init__(parent=parent)
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
54
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
55
        self.set_icon(
56
            self.render_icon_pixbuf(Gtk.STOCK_FIND, Gtk.IconSize.BUTTON))
0.1.18 by Aaron Bentley
Switched to using pink backgrounds
57
        self.annotate_colormap = AnnotateColorSaturation()
0.1.1 by Dan Loda
First working version of xannotate.
58
59
        self._create()
60
        self.revisions = {}
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
61
        self.history = []
173.1.1 by Aaron Bentley
Better behavior when unable to go back
62
        self._no_back = set()
0.1.17 by Dan Loda
A little refactoring.
63
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
64
    def annotate(self, tree, branch, file_id):
59.2.2 by Aaron Bentley
Annotate launches a diff for the particular revision
65
        self.annotations = []
66
        self.branch = branch
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
67
        self.tree = tree
59.2.3 by Aaron Bentley
Gannotate-launched diffs now jump to correct file
68
        self.file_id = file_id
330.3.6 by Daniel Schierbeck
Fixed bug in gannotate where logview was used instead of revisionview.
69
        self.revisionview.set_file_id(file_id)
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
70
        self.revision_id = getattr(tree, 'get_revision_id', 
71
                                   lambda: CURRENT_REVISION)()
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
72
259 by Aaron Bentley
Add author support to gannotate and log viewer
73
        # [revision id, line number, author, revno, highlight color, line]
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
74
        self.annomodel = Gtk.ListStore(GObject.TYPE_STRING,
75
                                       GObject.TYPE_INT,
76
                                       GObject.TYPE_STRING,
77
                                       GObject.TYPE_STRING,
78
                                       GObject.TYPE_STRING,
79
                                       GObject.TYPE_STRING)
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
80
0.1.1 by Dan Loda
First working version of xannotate.
81
        last_seen = None
0.4.1 by Aaron Bentley
Updated performance, API use
82
        try:
83
            branch.lock_read()
84
            branch.repository.lock_read()
436 by Aaron Bentley
Use Branch.get_revision_id_to_revno_map in gannotate
85
            self.dotted = {}
86
            revno_map = self.branch.get_revision_id_to_revno_map()
87
            for revision_id, revno in revno_map.iteritems():
88
                self.dotted[revision_id] = '.'.join(str(num) for num in revno)
0.4.1 by Aaron Bentley
Updated performance, API use
89
            for line_no, (revision, revno, line)\
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
90
                in enumerate(self._annotate(tree, file_id)):
0.4.1 by Aaron Bentley
Updated performance, API use
91
                if revision.revision_id == last_seen and not self.all:
273 by Aaron Bentley
Use get_apparent_author, rename variables to 'author'
92
                    revno = author = ""
0.4.1 by Aaron Bentley
Updated performance, API use
93
                else:
94
                    last_seen = revision.revision_id
642 by Jelmer Vernooij
Use get_apparent_authors() rather than deprecated get_apparent_author().
95
                    author = ", ".join(revision.get_apparent_authors())
0.4.1 by Aaron Bentley
Updated performance, API use
96
97
                if revision.revision_id not in self.revisions:
98
                    self.revisions[revision.revision_id] = revision
99
100
                self.annomodel.append([revision.revision_id,
101
                                       line_no + 1,
273 by Aaron Bentley
Use get_apparent_author, rename variables to 'author'
102
                                       author,
0.4.1 by Aaron Bentley
Updated performance, API use
103
                                       revno,
104
                                       None,
105
                                       line.rstrip("\r\n")
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
106
                                       ])
59.2.2 by Aaron Bentley
Annotate launches a diff for the particular revision
107
                self.annotations.append(revision)
0.4.1 by Aaron Bentley
Updated performance, API use
108
109
            if not self.plain:
66.6.1 by Aaron Bentley
Remove usused span selector
110
                now = time.time()
111
                self.annomodel.foreach(self._highlight_annotation, now)
0.4.1 by Aaron Bentley
Updated performance, API use
112
        finally:
113
            branch.repository.unlock()
114
            branch.unlock()
0.2.6 by Dan Loda
--plain option to disable highlighting. And update README
115
0.1.17 by Dan Loda
A little refactoring.
116
        self.annoview.set_model(self.annomodel)
117
        self.annoview.grab_focus()
438 by Aaron Bentley
Update window titles
118
        my_revno = self.dotted.get(self.revision_id, 'current')
119
        title = '%s (%s) - gannotate' % (self.tree.id2path(file_id), my_revno)
120
        self.set_title(title)
0.1.1 by Dan Loda
First working version of xannotate.
121
0.1.12 by Dan Loda
New --line option. Can now jump to a specific line number.
122
    def jump_to_line(self, lineno):
0.1.17 by Dan Loda
A little refactoring.
123
        if lineno > len(self.annomodel) or lineno < 1:
0.1.12 by Dan Loda
New --line option. Can now jump to a specific line number.
124
            row = 0
125
            # FIXME:should really deal with this in the gui. Perhaps a status
126
            # bar?
127
            print("gannotate: Line number %d does't exist. Defaulting to "
128
                  "line 1." % lineno)
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
129
            return
0.1.12 by Dan Loda
New --line option. Can now jump to a specific line number.
130
        else:
131
            row = lineno - 1
132
734.1.23 by Curtis Hovey
Always pass a Gtk.TreePath instead of an int or tuple.
133
        tree_path = Gtk.TreePath(path=row)
734.1.22 by Curtis Hovey
GtkTreeView.set_cursor(tree_path, None, False) is the default args.
134
        self.annoview.set_cursor(tree_path, None, False)
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
135
        self.annoview.scroll_to_cell(tree_path, use_align=True)
0.1.12 by Dan Loda
New --line option. Can now jump to a specific line number.
136
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
137
    def _annotate(self, tree, file_id):
138
        current_revision = FakeRevision(CURRENT_REVISION)
139
        current_revision.committer = self.branch.get_config().username()
140
        current_revision.timestamp = time.time()
141
        current_revision.message = '[Not yet committed]'
66.6.6 by Aaron Bentley
Support scrolling based on an offset
142
        current_revision.parent_ids = tree.get_parent_ids()
630 by Jelmer Vernooij
Use _get_nick(local=True) rather than .nick to get at a branches' nick, since
143
        current_revision.properties['branch-nick'] = self.branch._get_nick(local=True)
66.2.15 by Aaron Bentley
fix future revno
144
        current_revno = '%d?' % (self.branch.revno() + 1)
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
145
        repository = self.branch.repository
146
        if self.revision_id == CURRENT_REVISION:
147
            revision_id = self.branch.last_revision()
148
        else:
149
            revision_id = self.revision_id
66.6.5 by Aaron Bentley
Speed up the 'back' operation
150
        revision_cache = RevisionCache(repository, self.revisions)
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
151
        for origin, text in tree.annotate_iter(file_id):
0.4.1 by Aaron Bentley
Updated performance, API use
152
            rev_id = origin
66.6.7 by Aaron Bentley
Handle current revision better
153
            if rev_id == CURRENT_REVISION:
154
                revision = current_revision
155
                revno = current_revno
156
            else:
157
                try:
158
                    revision = revision_cache.get_revision(rev_id)
436 by Aaron Bentley
Use Branch.get_revision_id_to_revno_map in gannotate
159
                    revno = self.dotted.get(rev_id, 'merge')
66.6.7 by Aaron Bentley
Handle current revision better
160
                    if len(revno) > 15:
161
                        revno = 'merge'
162
                except NoSuchRevision:
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
163
                    revision = FakeRevision(rev_id)
164
                    revno = "?"
0.1.1 by Dan Loda
First working version of xannotate.
165
166
            yield revision, revno, text
167
0.2.2 by Dan Loda
Add file's age as default span
168
    def _highlight_annotation(self, model, path, iter, now):
169
        revision_id, = model.get(iter, REVISION_ID_COL)
170
        revision = self.revisions[revision_id]
734.1.12 by Curtis Hovey
Fixed row/path issues in gannoate.
171
        # XXX sinzui 2011-08-12: What does get_color return?
172
        color = self.annotate_colormap.get_color(revision, now)
173
        model.set_value(iter, HIGHLIGHT_COLOR_COL, color)
0.2.1 by Dan Loda
first go at emacs vc-annotate like highlighting
174
66.6.4 by Aaron Bentley
Add back button to see older versions
175
    def _selected_revision(self):
0.1.17 by Dan Loda
A little refactoring.
176
        (path, col) = self.annoview.get_cursor()
79 by Jelmer Vernooij
Handle empty files more gracefully. Fixes #58951.
177
        if path is None:
66.6.4 by Aaron Bentley
Add back button to see older versions
178
            return None
179
        return self.annomodel[path][REVISION_ID_COL]
180
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
181
    def _activate_selected_revision(self, w):
66.6.4 by Aaron Bentley
Add back button to see older versions
182
        rev_id = self._selected_revision()
464.2.1 by Adrian Wilkins
Detect the reserved null: revision in appropriate places.
183
        if not rev_id or rev_id == NULL_REVISION:
79 by Jelmer Vernooij
Handle empty files more gracefully. Fixes #58951.
184
            return
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
185
        selected = self.revisions[rev_id]
330.3.1 by Daniel Schierbeck
Renamed logview 'revisionview'.
186
        self.revisionview.set_revision(selected)
173.1.1 by Aaron Bentley
Better behavior when unable to go back
187
        if (len(selected.parent_ids) != 0 and selected.parent_ids[0] not in
188
            self._no_back):
189
            enable_back = True
190
        else:
191
            enable_back = False
192
        self.back_button.set_sensitive(enable_back)
0.1.1 by Dan Loda
First working version of xannotate.
193
194
    def _create(self):
330.3.1 by Daniel Schierbeck
Renamed logview 'revisionview'.
195
        self.revisionview = self._create_log_view()
0.1.17 by Dan Loda
A little refactoring.
196
        self.annoview = self._create_annotate_view()
197
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
198
        vbox = Gtk.VBox(homogeneous=False, spacing=0)
0.2.1 by Dan Loda
first go at emacs vc-annotate like highlighting
199
        vbox.show()
0.1.17 by Dan Loda
A little refactoring.
200
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
201
        sw = Gtk.ScrolledWindow()
202
        sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
203
        sw.set_shadow_type(Gtk.ShadowType.IN)
0.1.17 by Dan Loda
A little refactoring.
204
        sw.add(self.annoview)
59.2.2 by Aaron Bentley
Annotate launches a diff for the particular revision
205
        self.annoview.gwindow = self
0.1.17 by Dan Loda
A little refactoring.
206
        sw.show()
170.1.4 by Aaron Bentley
Move search fields directly below source window
207
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
208
        swbox = Gtk.VBox()
209
        swbox.pack_start(sw, True, True, 0)
170.1.4 by Aaron Bentley
Move search fields directly below source window
210
        swbox.show()
170.1.6 by Aaron Bentley
Move buttons to top, tweak layout
211
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
212
        hbox = Gtk.HBox(homogeneous=False, spacing=6)
170.1.6 by Aaron Bentley
Move buttons to top, tweak layout
213
        self.back_button = self._create_back_button()
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
214
        hbox.pack_start(self.back_button, False, True, 0)
170.1.6 by Aaron Bentley
Move buttons to top, tweak layout
215
        self.forward_button = self._create_forward_button()
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
216
        hbox.pack_start(self.forward_button, False, True, 0)
688.1.3 by Martin Pool
Add 'Find' button to start text search
217
        self.find_button = self._create_find_button()
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
218
        hbox.pack_start(self.find_button, False, True, 0)
688.1.4 by Martin Pool
Add button to goto-line too
219
        self.goto_button = self._create_goto_button()
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
220
        hbox.pack_start(self.goto_button, False, True, 0)
170.1.6 by Aaron Bentley
Move buttons to top, tweak layout
221
        hbox.show()
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
222
        vbox.pack_start(hbox, False, True, 0)
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
223
775.1.1 by Curtis Hovey
gtk.VPaned was replaced with Gtk.Paned
224
        self.pane = pane = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
170.1.4 by Aaron Bentley
Move search fields directly below source window
225
        pane.add1(swbox)
330.3.1 by Daniel Schierbeck
Renamed logview 'revisionview'.
226
        pane.add2(self.revisionview)
0.1.1 by Dan Loda
First working version of xannotate.
227
        pane.show()
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
228
        vbox.pack_start(pane, True, True, 0)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
229
230
        self._search = SearchBox()
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
231
        swbox.pack_start(self._search, False, True, 0)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
232
        accels = Gtk.AccelGroup()
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
233
        accels.connect(Gdk.KEY_f, Gdk.ModifierType.CONTROL_MASK,
234
                             Gtk.AccelFlags.LOCKED,
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
235
                             self._search_by_text)
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
236
        accels.connect(Gdk.KEY_g, Gdk.ModifierType.CONTROL_MASK,
237
                             Gtk.AccelFlags.LOCKED,
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
238
                             self._search_by_line)
239
        self.add_accel_group(accels)
240
0.1.1 by Dan Loda
First working version of xannotate.
241
        self.add(vbox)
242
688.1.3 by Martin Pool
Add 'Find' button to start text search
243
    def _search_by_text(self, *ignored): # (accel_group, window, key, modifiers):
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
244
        self._search.show_for('text')
66.5.3 by v.ladeuil+lp at free
Realbetter fix for bug #73965.
245
        self._search.set_target(self.annoview, TEXT_LINE_COL)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
246
688.1.4 by Martin Pool
Add button to goto-line too
247
    def _search_by_line(self, *ignored): # accel_group, window, key, modifiers):
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
248
        self._search.show_for('line')
66.5.3 by v.ladeuil+lp at free
Realbetter fix for bug #73965.
249
        self._search.set_target(self.annoview, LINE_NUM_COL)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
250
438 by Aaron Bentley
Update window titles
251
    def line_diff(self, tv, path, tvc):
734.1.12 by Curtis Hovey
Fixed row/path issues in gannoate.
252
        row = path.get_indices()[0]
59.2.2 by Aaron Bentley
Annotate launches a diff for the particular revision
253
        revision = self.annotations[row]
65 by Aaron Bentley
Handle first revision properly
254
        repository = self.branch.repository
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
255
        if revision.revision_id == CURRENT_REVISION:
256
            tree1 = self.tree
257
            tree2 = self.tree.basis_tree()
65 by Aaron Bentley
Handle first revision properly
258
        else:
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
259
            tree1 = repository.revision_tree(revision.revision_id)
260
            if len(revision.parent_ids) > 0:
261
                tree2 = repository.revision_tree(revision.parent_ids[0])
262
            else:
263
                tree2 = repository.revision_tree(NULL_REVISION)
150 by Jelmer Vernooij
Fix handling showing diffs of working tree changes.
264
        from bzrlib.plugins.gtk.diff import DiffWindow
707.1.1 by Sergei Golubchik
* make sure that gdiff opened from gannotate knows its parent
265
        window = DiffWindow(self)
438 by Aaron Bentley
Update window titles
266
        window.set_diff("Diff for line %d" % (row+1), tree1, tree2)
59.2.3 by Aaron Bentley
Gannotate-launched diffs now jump to correct file
267
        window.set_file(tree1.id2path(self.file_id))
59.2.2 by Aaron Bentley
Annotate launches a diff for the particular revision
268
        window.show()
269
270
0.1.1 by Dan Loda
First working version of xannotate.
271
    def _create_annotate_view(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
272
        tv = Gtk.TreeView()
0.1.17 by Dan Loda
A little refactoring.
273
        tv.set_rules_hint(False)
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
274
        tv.connect("cursor-changed", self._activate_selected_revision)
0.1.17 by Dan Loda
A little refactoring.
275
        tv.show()
438 by Aaron Bentley
Update window titles
276
        tv.connect("row-activated", self.line_diff)
0.1.1 by Dan Loda
First working version of xannotate.
277
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
278
        cell = Gtk.CellRendererText()
0.1.1 by Dan Loda
First working version of xannotate.
279
        cell.set_property("xalign", 1.0)
280
        cell.set_property("ypad", 0)
281
        cell.set_property("family", "Monospace")
282
        cell.set_property("cell-background-gdk",
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
283
                          tv.get_style().bg[Gtk.StateType.NORMAL])
284
        col = Gtk.TreeViewColumn()
0.1.1 by Dan Loda
First working version of xannotate.
285
        col.set_resizable(False)
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
286
        col.pack_start(cell, True)
0.1.1 by Dan Loda
First working version of xannotate.
287
        col.add_attribute(cell, "text", LINE_NUM_COL)
0.1.17 by Dan Loda
A little refactoring.
288
        tv.append_column(col)
0.1.1 by Dan Loda
First working version of xannotate.
289
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
290
        cell = Gtk.CellRendererText()
0.1.1 by Dan Loda
First working version of xannotate.
291
        cell.set_property("ypad", 0)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
292
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
0.1.1 by Dan Loda
First working version of xannotate.
293
        cell.set_property("cell-background-gdk",
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
294
                          self.get_style().bg[Gtk.StateType.NORMAL])
295
        col = Gtk.TreeViewColumn("Committer")
0.1.1 by Dan Loda
First working version of xannotate.
296
        col.set_resizable(True)
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
297
        col.pack_start(cell, True)
0.1.1 by Dan Loda
First working version of xannotate.
298
        col.add_attribute(cell, "text", COMMITTER_COL)
0.1.17 by Dan Loda
A little refactoring.
299
        tv.append_column(col)
0.1.1 by Dan Loda
First working version of xannotate.
300
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
301
        cell = Gtk.CellRendererText()
0.1.1 by Dan Loda
First working version of xannotate.
302
        cell.set_property("xalign", 1.0)
303
        cell.set_property("ypad", 0)
304
        cell.set_property("cell-background-gdk",
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
305
                          self.get_style().bg[Gtk.StateType.NORMAL])
306
        col = Gtk.TreeViewColumn("Revno")
0.1.1 by Dan Loda
First working version of xannotate.
307
        col.set_resizable(False)
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
308
        col.pack_start(cell, True)
0.1.1 by Dan Loda
First working version of xannotate.
309
        col.add_attribute(cell, "markup", REVNO_COL)
0.1.17 by Dan Loda
A little refactoring.
310
        tv.append_column(col)
0.1.1 by Dan Loda
First working version of xannotate.
311
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
312
        cell = Gtk.CellRendererText()
0.1.1 by Dan Loda
First working version of xannotate.
313
        cell.set_property("ypad", 0)
314
        cell.set_property("family", "Monospace")
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
315
        col = Gtk.TreeViewColumn()
0.1.1 by Dan Loda
First working version of xannotate.
316
        col.set_resizable(False)
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
317
        col.pack_start(cell, True)
0.1.18 by Aaron Bentley
Switched to using pink backgrounds
318
#        col.add_attribute(cell, "foreground", HIGHLIGHT_COLOR_COL)
319
        col.add_attribute(cell, "background", HIGHLIGHT_COLOR_COL)
0.1.1 by Dan Loda
First working version of xannotate.
320
        col.add_attribute(cell, "text", TEXT_LINE_COL)
0.1.17 by Dan Loda
A little refactoring.
321
        tv.append_column(col)
0.1.1 by Dan Loda
First working version of xannotate.
322
723.1.1 by Sergei Golubchik
interactive substring search in gannotate
323
        # interactive substring search
324
        def search_equal_func(model, column, key, iter):
325
            return model.get_value(iter, TEXT_LINE_COL).lower().find(key.lower()) == -1
326
327
        tv.set_enable_search(True)
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
328
        tv.set_search_equal_func(search_equal_func, None)
66.5.1 by v.ladeuil+lp at free
Minimal fix for bug #73965.
329
0.1.17 by Dan Loda
A little refactoring.
330
        return tv
0.1.1 by Dan Loda
First working version of xannotate.
331
332
    def _create_log_view(self):
473.1.1 by Andrew Bennetts
Simple hack to fix gannotate.
333
        lv = RevisionView(self._branch)
0.1.17 by Dan Loda
A little refactoring.
334
        lv.show()
335
        return lv
0.1.1 by Dan Loda
First working version of xannotate.
336
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
337
    def _create_back_button(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
338
        button = Gtk.Button()
66.6.4 by Aaron Bentley
Add back button to see older versions
339
        button.set_use_stock(True)
340
        button.set_label("gtk-go-back")
341
        button.connect("clicked", lambda w: self.go_back())
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
342
        button.set_relief(Gtk.ReliefStyle.NONE)
66.6.4 by Aaron Bentley
Add back button to see older versions
343
        button.show()
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
344
        return button
345
346
    def _create_forward_button(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
347
        button = Gtk.Button()
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
348
        button.set_use_stock(True)
349
        button.set_label("gtk-go-forward")
350
        button.connect("clicked", lambda w: self.go_forward())
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
351
        button.set_relief(Gtk.ReliefStyle.NONE)
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
352
        button.show()
353
        button.set_sensitive(False)
354
        return button
66.6.4 by Aaron Bentley
Add back button to see older versions
355
688.1.3 by Martin Pool
Add 'Find' button to start text search
356
    def _create_find_button(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
357
        button = Gtk.Button()
688.1.3 by Martin Pool
Add 'Find' button to start text search
358
        button.set_use_stock(True)
359
        button.set_label("gtk-find")
688.1.5 by Martin Pool
Also show tooltips on find/goto buttons
360
        button.set_tooltip_text("Search for text (Ctrl+F)")
688.1.3 by Martin Pool
Add 'Find' button to start text search
361
        button.connect("clicked", self._search_by_text)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
362
        button.set_relief(Gtk.ReliefStyle.NONE)
688.1.3 by Martin Pool
Add 'Find' button to start text search
363
        button.show()
364
        button.set_sensitive(True)
365
        return button
366
688.1.4 by Martin Pool
Add button to goto-line too
367
    def _create_goto_button(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
368
        button = Gtk.Button()
688.1.4 by Martin Pool
Add button to goto-line too
369
        button.set_label("Goto Line")
688.1.5 by Martin Pool
Also show tooltips on find/goto buttons
370
        button.set_tooltip_text("Scroll to a line by entering its number (Ctrl+G)")
688.1.4 by Martin Pool
Add button to goto-line too
371
        button.connect("clicked", self._search_by_line)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
372
        button.set_relief(Gtk.ReliefStyle.NONE)
688.1.4 by Martin Pool
Add button to goto-line too
373
        button.show()
374
        button.set_sensitive(True)
375
        return button
376
66.6.4 by Aaron Bentley
Add back button to see older versions
377
    def go_back(self):
173.1.1 by Aaron Bentley
Better behavior when unable to go back
378
        last_tree = self.tree
66.6.4 by Aaron Bentley
Add back button to see older versions
379
        rev_id = self._selected_revision()
380
        parent_id = self.revisions[rev_id].parent_ids[0]
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
381
        target_tree = self.branch.repository.revision_tree(parent_id)
173.1.1 by Aaron Bentley
Better behavior when unable to go back
382
        if self._go(target_tree):
383
            self.history.append(last_tree)
384
            self.forward_button.set_sensitive(True)
385
        else:
386
            self._no_back.add(parent_id)
387
            self.back_button.set_sensitive(False)
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
388
389
    def go_forward(self):
390
        if len(self.history) == 0:
391
            return
392
        target_tree = self.history.pop()
393
        if len(self.history) == 0:
394
            self.forward_button.set_sensitive(False)
395
        self._go(target_tree)
396
397
    def _go(self, target_tree):
398
        rev_id = self._selected_revision()
399
        if self.file_id in target_tree:
400
            offset = self.get_scroll_offset(target_tree)
734.1.12 by Curtis Hovey
Fixed row/path issues in gannoate.
401
            path, col = self.annoview.get_cursor()
402
            (row,) = path.get_indices()
170.1.5 by Aaron Bentley
Add 'forward' button, much button cleanup
403
            self.annotate(target_tree, self.branch, self.file_id)
404
            new_row = row+offset
405
            if new_row < 0:
406
                new_row = 0
734.1.12 by Curtis Hovey
Fixed row/path issues in gannoate.
407
            new_path = Gtk.TreePath(path=new_row)
408
            self.annoview.set_cursor(new_path, None, False)
173.1.1 by Aaron Bentley
Better behavior when unable to go back
409
            return True
410
        else:
411
            return False
66.6.6 by Aaron Bentley
Support scrolling based on an offset
412
413
    def get_scroll_offset(self, tree):
414
        old = self.tree.get_file(self.file_id)
415
        new = tree.get_file(self.file_id)
734.1.12 by Curtis Hovey
Fixed row/path issues in gannoate.
416
        path, col = self.annoview.get_cursor()
417
        (row,) = path.get_indices()
66.6.6 by Aaron Bentley
Support scrolling based on an offset
418
        matcher = patiencediff.PatienceSequenceMatcher(None, old.readlines(),
419
                                                       new.readlines())
420
        for i, j, n in matcher.get_matching_blocks():
421
            if i + n >= row:
422
                return j - i
423
0.1.1 by Dan Loda
First working version of xannotate.
424
642 by Jelmer Vernooij
Use get_apparent_authors() rather than deprecated get_apparent_author().
425
class FakeRevision(object):
0.1.1 by Dan Loda
First working version of xannotate.
426
    """ A fake revision.
427
428
    For when a revision is referenced but not present.
429
    """
430
157.1.7 by Aaron Bentley
Fix branch-nick handling
431
    def __init__(self, revision_id, committer='?', nick=None):
0.1.1 by Dan Loda
First working version of xannotate.
432
        self.revision_id = revision_id
433
        self.parent_ids = []
66.2.14 by Aaron Bentley
Annotate showing uncommitted changes
434
        self.committer = committer
0.1.1 by Dan Loda
First working version of xannotate.
435
        self.message = "?"
436
        self.timestamp = 0.0
437
        self.timezone = 0
157.1.7 by Aaron Bentley
Fix branch-nick handling
438
        self.properties = {}
0.1.1 by Dan Loda
First working version of xannotate.
439
642 by Jelmer Vernooij
Use get_apparent_authors() rather than deprecated get_apparent_author().
440
    def get_apparent_authors(self):
441
        return [self.committer]
273 by Aaron Bentley
Use get_apparent_author, rename variables to 'author'
442
0.1.23 by Aaron Bentley
Added revision caching to initial annotation
443
444
class RevisionCache(object):
445
    """A caching revision source"""
642 by Jelmer Vernooij
Use get_apparent_authors() rather than deprecated get_apparent_author().
446
66.6.5 by Aaron Bentley
Speed up the 'back' operation
447
    def __init__(self, real_source, seed_cache=None):
0.1.23 by Aaron Bentley
Added revision caching to initial annotation
448
        self.__real_source = real_source
66.6.5 by Aaron Bentley
Speed up the 'back' operation
449
        if seed_cache is None:
450
            self.__cache = {}
451
        else:
452
            self.__cache = dict(seed_cache)
0.1.23 by Aaron Bentley
Added revision caching to initial annotation
453
454
    def get_revision(self, revision_id):
455
        if revision_id not in self.__cache:
456
            revision = self.__real_source.get_revision(revision_id)
457
            self.__cache[revision_id] = revision
458
        return self.__cache[revision_id]
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
459
734.1.51 by Curtis Hovey
Fix the initializer for many classes.
460
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
461
class SearchBox(Gtk.HBox):
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
462
    """A button box for searching in text or lines of annotations"""
463
    def __init__(self):
734.1.51 by Curtis Hovey
Fix the initializer for many classes.
464
        super(SearchBox, self).__init__(homogeneous=False, spacing=6)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
465
466
        # Close button
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
467
        button = Gtk.Button()
468
        image = Gtk.Image()
469
        image.set_from_stock('gtk-stop', Gtk.IconSize.BUTTON)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
470
        button.set_image(image)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
471
        button.set_relief(Gtk.ReliefStyle.NONE)
734.1.13 by Curtis Hovey
Fixed search in diff.
472
        button.connect("clicked", lambda w: self.hide())
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
473
        self.pack_start(button, False, False, 0)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
474
475
        # Search entry
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
476
        label = Gtk.Label()
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
477
        self._label = label
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
478
        self.pack_start(label, False, False, 0)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
479
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
480
        entry = Gtk.Entry()
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
481
        self._entry = entry
482
        entry.connect("activate", lambda w, d: self._do_search(d),
483
                      'forward')
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
484
        self.pack_start(entry, False, False, 0)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
485
486
        # Next/previous buttons
782.1.1 by Curtis Hovey
Create the mnemonic for the button label.
487
        button = Gtk.Button(_i18n('_Next'), use_underline=True)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
488
        image = Gtk.Image()
489
        image.set_from_stock('gtk-go-forward', Gtk.IconSize.BUTTON)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
490
        button.set_image(image)
491
        button.connect("clicked", lambda w, d: self._do_search(d),
492
                       'forward')
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
493
        self.pack_start(button, False, False, 0)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
494
782.1.1 by Curtis Hovey
Create the mnemonic for the button label.
495
        button = Gtk.Button(_i18n('_Previous'), use_underline=True)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
496
        image = Gtk.Image()
497
        image.set_from_stock('gtk-go-back', Gtk.IconSize.BUTTON)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
498
        button.set_image(image)
499
        button.connect("clicked", lambda w, d: self._do_search(d),
500
                       'backward')
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
501
        self.pack_start(button, False, False, 0)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
502
503
        # Search options
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
504
        check = Gtk.CheckButton('Match case')
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
505
        self._match_case = check
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
506
        self.pack_start(check, False, False, 0)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
507
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
508
        check = Gtk.CheckButton('Regexp')
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
509
        check.connect("toggled", lambda w: self._set_label())
510
        self._regexp = check
734.1.6 by Curtis Hovey
Added a very rough fix to see gannontation.
511
        self.pack_start(check, False, False, 0)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
512
513
        self._view = None
514
        self._column = None
515
        # Note that we stay hidden (we do not call self.show_all())
516
517
518
    def show_for(self, kind):
519
        self._kind = kind
520
        self.show_all()
521
        self._set_label()
522
        # Hide unrelated buttons
523
        if kind == 'line':
524
            self._match_case.hide()
525
            self._regexp.hide()
526
        # Be ready
527
        self._entry.grab_focus()
528
529
    def _set_label(self):
530
        if self._kind == 'line':
531
            self._label.set_text('Find Line: ')
532
        else:
533
            if self._regexp.get_active():
534
                self._label.set_text('Find Regexp: ')
535
            else:
536
                self._label.set_text('Find Text: ')
537
538
    def set_target(self, view,column):
539
        self._view = view
540
        self._column = column
541
542
    def _match(self, model, iterator, column):
543
        matching_case = self._match_case.get_active()
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
544
        cell_value, = model.get(iterator, column)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
545
        key = self._entry.get_text()
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
546
        if column == LINE_NUM_COL:
547
            # FIXME: For goto-line there are faster algorithms than searching 
548
            # every line til we find the right one! -- mbp 2011-01-27
549
            return key.strip() == str(cell_value)
550
        elif self._regexp.get_active():
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
551
            if matching_case:
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
552
                match = re.compile(key).search(cell_value, 1)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
553
            else:
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
554
                match = re.compile(key, re.I).search(cell_value, 1)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
555
        else:
556
            if not matching_case:
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
557
                cell_value = cell_value.lower()
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
558
                key = key.lower()
706 by Martin Pool
Store line numbers as ints in the gannotate ListStore.
559
            match = cell_value.find(key) != -1
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
560
561
        return match
562
563
    def _iterate_rows_forward(self, model, start):
564
        model_size = len(model)
565
        current = start + 1
566
        while model_size != 0:
567
            if current >= model_size: current =  0
568
            yield model.get_iter_from_string('%d' % current)
569
            if current == start: raise StopIteration
570
            current += 1
571
572
    def _iterate_rows_backward(self, model, start):
573
        model_size = len(model)
574
        current = start - 1
575
        while model_size != 0:
576
            if current < 0: current = model_size - 1
577
            yield model.get_iter_from_string('%d' % current)
578
            if current == start: raise StopIteration
579
            current -= 1
580
581
    def _do_search(self, direction):
582
        if direction == 'forward':
583
            iterate = self._iterate_rows_forward
584
        else:
585
            iterate = self._iterate_rows_backward
586
587
        model, sel = self._view.get_selection().get_selected()
588
        if sel is None:
589
            start = 0
590
        else:
591
            path = model.get_string_from_iter(sel)
592
            start = int(path)
593
594
        for row in iterate(model, start):
595
            if self._match(model, row, self._column):
596
                path = model.get_path(row)
734.1.13 by Curtis Hovey
Fixed search in diff.
597
                self._view.set_cursor(path, None, False)
66.5.2 by v.ladeuil+lp at free
Better fix for bug #73965.
598
                self._view.scroll_to_cell(path, use_align=True)
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
599
                break