/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: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
status.py
21
21
    pass
22
22
 
23
23
import gtk
 
24
from bzrlib.plugins.gtk import _i18n
 
25
 
24
26
 
25
27
class StatusDialog(gtk.Dialog):
26
28
    """ Display Status window and perform the needed actions. """
79
81
        
80
82
        if len(delta.added):
81
83
            changes = True
82
 
            titer = self.model.append(None, [ _('Added'), None ])
 
84
            titer = self.model.append(None, [ _i18n('Added'), None ])
83
85
            for path, id, kind in delta.added:
84
86
                self.model.append(titer, [ path, path ])
85
87
 
86
88
        if len(delta.removed):
87
89
            changes = True
88
 
            titer = self.model.append(None, [ _('Removed'), None ])
 
90
            titer = self.model.append(None, [ _i18n('Removed'), None ])
89
91
            for path, id, kind in delta.removed:
90
92
                self.model.append(titer, [ path, path ])
91
93
 
92
94
        if len(delta.renamed):
93
95
            changes = True
94
 
            titer = self.model.append(None, [ _('Renamed'), None ])
 
96
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
95
97
            for oldpath, newpath, id, kind, text_modified, meta_modified \
96
98
                    in delta.renamed:
97
99
                self.model.append(titer, [ oldpath, newpath ])
98
100
 
99
101
        if len(delta.modified):
100
102
            changes = True
101
 
            titer = self.model.append(None, [ _('Modified'), None ])
 
103
            titer = self.model.append(None, [ _i18n('Modified'), None ])
102
104
            for path, id, kind, text_modified, meta_modified in delta.modified:
103
105
                self.model.append(titer, [ path, path ])
104
106
        
106
108
        for path in self.wt.unknowns():
107
109
            changes = True
108
110
            if not done_unknown:
109
 
                titer = self.model.append(None, [ _('Unknown'), None ])
 
111
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
110
112
                done_unknown = True
111
113
            self.model.append(titer, [ path, path ])
112
114
 
113
115
        if not changes:
114
 
            self.model.append(None, [ _('No changes.'), None ])
 
116
            self.model.append(None, [ _i18n('No changes.'), None ])
115
117
 
116
118
        self.treeview.expand_all()
117
119