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

  • Committer: Adrian Wilkins
  • Date: 2008-04-24 15:26:14 UTC
  • mto: This revision was merged to the branch mainline in revision 470.
  • Revision ID: adrian.wilkins@gmail.com-20080424152614-2rnnljbro6vzqvf7
Detect the reserved null: revision in appropriate places. 

This removes a huge shower of stack traces that get dumped to console when 
you look at the bottom of a log.

Show diffs side-by-side

added added

removed removed

Lines of Context:
status.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import sys
18
 
 
19
17
try:
20
18
    import pygtk
21
19
    pygtk.require("2.0")
22
20
except:
23
21
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
    import gobject
28
 
    import pango
29
 
except:
30
 
    sys.exit(1)
31
 
 
32
 
import bzrlib
33
 
import bzrlib.errors as errors
34
 
 
35
 
from bzrlib.status import show_tree_status
36
 
from bzrlib.workingtree import WorkingTree
37
 
 
38
 
from dialog import OliveDialog
39
 
 
40
 
class OliveStatus:
 
22
 
 
23
import gtk
 
24
 
 
25
class StatusDialog(gtk.Dialog):
41
26
    """ Display Status window and perform the needed actions. """
42
 
    def __init__(self, gladefile, wt, wtpath):
 
27
    def __init__(self, wt, wtpath, revision=None):
43
28
        """ Initialize the Status window. """
44
 
        self.gladefile = gladefile
45
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_status')
46
 
        
47
 
        # Get the Status window widget
48
 
        self.window = self.glade.get_widget('window_status')
 
29
        super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
 
30
        self.set_title("Working tree changes")
 
31
        self._create()
49
32
        self.wt = wt
50
33
        self.wtpath = wtpath
51
34
        
52
 
        # Check if current location is a branch
53
 
        try:
54
 
            branch = wt.branch
55
 
        except errors.NotBranchError:
56
 
            self.notbranch = True
57
 
            return
58
 
        except:
59
 
            raise
60
 
        
61
 
        file_id = self.wt.path2id(wtpath)
62
 
 
63
 
        self.notbranch = False
64
 
        if file_id is None:
65
 
            self.notbranch = True
66
 
            return
67
 
        
 
35
        if revision is None:
 
36
            revision = self.wt.branch.last_revision()
 
37
            
68
38
        # Set the old working tree
69
 
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
70
 
        
71
 
        # Dictionary for signal_autoconnect
72
 
        dic = { "on_button_status_close_clicked": self.close }
73
 
        
74
 
        # Connect the signals to the handlers
75
 
        self.glade.signal_autoconnect(dic)
76
 
        
 
39
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
77
40
        # Generate status output
78
41
        self._generate_status()
79
42
 
 
43
    def _create(self):
 
44
        self.set_default_size(400, 300)
 
45
        scrolledwindow = gtk.ScrolledWindow()
 
46
        scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
47
        self.treeview = gtk.TreeView()
 
48
        scrolledwindow.add(self.treeview)
 
49
        self.vbox.pack_start(scrolledwindow, True, True)
 
50
        self.vbox.show_all()
 
51
 
 
52
    def row_diff(self, tv, path, tvc):
 
53
        file = self.model[path][1]
 
54
        if file is None:
 
55
            return
 
56
        from bzrlib.plugins.gtk.diff import DiffWindow
 
57
        window = DiffWindow()
 
58
        window.set_diff("Working tree changes", self.old_tree, self.wt)
 
59
        window.set_file(file)
 
60
        window.show()
 
61
 
80
62
    def _generate_status(self):
81
63
        """ Generate 'bzr status' output. """
82
64
        self.model = gtk.TreeStore(str, str)
83
 
        self.treeview = self.glade.get_widget('treeview_status')
 
65
        self.treeview.set_headers_visible(False)
84
66
        self.treeview.set_model(self.model)
 
67
        self.treeview.connect("row-activated", self.row_diff)
85
68
        
86
69
        cell = gtk.CellRendererText()
87
70
        cell.set_property("width-chars", 20)
132
115
 
133
116
        self.treeview.expand_all()
134
117
    
135
 
    def display(self):
136
 
        """ Display the Diff window. """
137
 
        if self.notbranch:
138
 
            error_dialog(_('Directory is not a branch'),
139
 
                                     _('You can perform this action only in a branch.'))
140
 
            self.close()
141
 
        else:
142
 
            self.window.show_all()
143
 
 
144
118
    def close(self, widget=None):
145
119
        self.window.destroy()