/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 revisionmenu.py

  • Committer: Mateusz Korniak
  • Date: 2007-09-17 10:33:57 UTC
  • Revision ID: matkor@laptop-hp-20070917103357-6300yixxury1s3n4
Bugfix: Fixed push (with overwite) behavior when branches are diverged.
Now it really works after user accepting overwrite and even shows infor about revisions pushed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionmenu.py
23
23
 
24
24
import bzrlib
25
25
import gtk
26
 
import gobject
27
 
from bzrlib import (errors, ui)
28
 
from bzrlib.revision import NULL_REVISION
29
26
 
30
27
class RevisionPopupMenu(gtk.Menu):
31
 
 
32
 
    __gsignals__ = {
33
 
            'tag-added': (
34
 
                gobject.SIGNAL_RUN_FIRST,
35
 
                gobject.TYPE_NONE,
36
 
                (gobject.TYPE_STRING, gobject.TYPE_STRING)
37
 
            )
38
 
    }
39
 
 
40
 
    def __init__(self, repository, revids, branch=None, wt=None):
 
28
    def __init__(self, repository, revids, branch=None):
41
29
        super(RevisionPopupMenu, self).__init__()
42
30
        self.branch = branch
43
31
        self.repository = repository
44
 
        self.wt = wt
45
32
        self.revids = revids
46
33
        self.create_items()
47
34
 
48
35
    def create_items(self):
49
36
        if len(self.revids) == 1:
50
 
            item = gtk.MenuItem("View _Changes")
 
37
            item = gtk.MenuItem("View _Diff")
51
38
            item.connect('activate', self.show_diff)
52
39
            self.append(item)
53
40
            self.show_all()
66
53
            item.connect('activate', self.store_merge_directive)
67
54
            # FIXME: self.append(item)
68
55
            self.show_all()
69
 
            
70
 
            if self.wt:
71
 
                item = gtk.MenuItem("_Revert to this revision")
72
 
                item.connect('activate', self.revert)
73
 
                self.append(item)
74
 
                self.show_all()
75
56
 
76
57
    def store_merge_directive(self, item):
77
58
        from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog
80
61
 
81
62
    def show_diff(self, item):
82
63
        from bzrlib.plugins.gtk.diff import DiffWindow
83
 
        window = DiffWindow(parent=self.parent)
84
 
        parentids = self.repository.revision_parents(self.revids[0])
85
 
 
86
 
        if len(parentids) == 0:
87
 
            parentid = NULL_REVISION
88
 
        else:
89
 
            parentid = parentids[0]
90
 
 
91
 
        rev_tree    = self.repository.revision_tree(self.revids[0])
92
 
        parent_tree = self.repository.revision_tree(parentid)
 
64
        window = DiffWindow()
 
65
        parentid = self.repository.revision_parents(self.revids[0])[0]
 
66
        (parent_tree, rev_tree) = self.repository.revision_trees(
 
67
            [parentid, self.revids[0]])
93
68
        window.set_diff(self.revids[0], rev_tree, parent_tree)
94
69
        window.show()
95
70
 
96
71
    def show_push(self, item):
97
72
        from bzrlib.plugins.gtk.push import PushDialog
98
73
        dialog = PushDialog(self.repository, self.revids[0], self.branch)
99
 
        response = dialog.run()
100
 
 
101
 
        if response != gtk.RESPONSE_NONE:
102
 
            dialog.destroy()
 
74
        dialog.run()
103
75
 
104
76
    def show_tag(self, item):
105
77
        from bzrlib.plugins.gtk.tags import AddTagDialog
106
78
        dialog = AddTagDialog(self.repository, self.revids[0], self.branch)
107
79
        response = dialog.run()
108
 
 
109
80
        if response != gtk.RESPONSE_NONE:
110
81
            dialog.hide()
111
82
        
112
83
            if response == gtk.RESPONSE_OK:
113
 
                self.emit('tag-added', dialog.tagname, dialog._revid)
 
84
                self.branch.lock_write()
 
85
                self.branch.tags.set_tag(dialog.tagname, dialog._revid)
 
86
                self.branch.unlock()
114
87
            
115
88
            dialog.destroy()
116
 
    
117
 
    def revert(self, item):
118
 
        pb = ui.ui_factory.nested_progress_bar()
119
 
        revision_tree = self.branch.repository.revision_tree(self.revids[0])
120
 
        try:
121
 
            self.wt.revert(old_tree = revision_tree, pb = pb)
122
 
        finally:
123
 
            pb.finished()