/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 viz/branchwin.py

  • Committer: Daniel Schierbeck
  • Date: 2007-11-06 18:02:09 UTC
  • Revision ID: daniel.schierbeck@gmail.com-20071106180209-mrlhg28ma5a6jebf
Fixed locks and made tagging work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
import pango
15
15
 
16
16
from bzrlib.plugins.gtk.window import Window
 
17
from bzrlib.plugins.gtk.tags import AddTagDialog
17
18
from bzrlib.plugins.gtk.preferences import PreferencesWindow
18
19
from bzrlib.revision import Revision
19
20
from bzrlib.config import BranchConfig
161
162
        revision_menu_diff.connect('activate', 
162
163
                lambda w: self.treeview.show_diff())
163
164
 
164
 
        revision_menu.add(gtk.MenuItem("Tag Revision"))
 
165
        revision_menu_tag = gtk.MenuItem("Tag Revision")
 
166
        revision_menu_tag.connect('activate', self._tag_revision_cb)
 
167
 
 
168
        revision_menu.add(revision_menu_tag)
165
169
        revision_menu.add(revision_menu_diff)
166
170
 
167
171
        branch_menu = gtk.Menu()
325
329
    def _set_revision_cb(self, w, revision_id):
326
330
        self.treeview.set_revision_id(revision_id)
327
331
 
 
332
    def _tag_revision_cb(self, w):
 
333
        dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
334
        response = dialog.run()
 
335
        if response != gtk.RESPONSE_NONE:
 
336
            dialog.hide()
 
337
        
 
338
            if response == gtk.RESPONSE_OK:
 
339
                try:
 
340
                    self.branch.lock_write()
 
341
                    self.branch.tags.set_tag(dialog.tagname, dialog._revid)
 
342
                finally:
 
343
                    self.branch.unlock()
 
344
            
 
345
            dialog.destroy()
 
346
 
328
347
    def _col_visibility_changed(self, col, property):
329
348
        self.treeview.set_property(property + '-column-visible', col.get_active())
330
349