/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 olive/commit.py

  • Committer: Alexander Belchenko
  • Date: 2006-10-25 10:20:40 UTC
  • mto: (91.1.8 trunk) (66.2.10 trunk)
  • mto: This revision was merged to the branch mainline in revision 107.
  • Revision ID: bialix@ukr.net-20061025102040-90bcdbad341ee3fa
- Show file kind marker with path (i.e. directory path ends with '/')
- Show renames similar to bzr (i.e. 'old => new')

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/commit.py
26
26
import pango
27
27
 
28
28
import bzrlib.errors as errors
 
29
from bzrlib import osutils
29
30
 
30
31
from dialog import error_dialog
31
32
from gladefile import GLADEFILENAME
122
123
                                     gtk.CellRendererText(), text=2))
123
124
 
124
125
        for path, id, kind in self.delta.added:
125
 
            self.file_store.append([ True, path, _('added') ])
 
126
            marker = osutils.kind_marker(kind)
 
127
            self.file_store.append([ True, path+marker, _('added') ])
126
128
 
127
129
        for path, id, kind in self.delta.removed:
128
 
            self.file_store.append([ True, path, _('removed') ])
 
130
            marker = osutils.kind_marker(kind)
 
131
            self.file_store.append([ True, path+marker, _('removed') ])
129
132
 
130
133
        for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
131
 
            self.file_store.append([ True, oldpath, _('renamed') ])
 
134
            marker = osutils.kind_marker(kind)
 
135
            self.file_store.append([ True,
 
136
                                     oldpath+marker + '  =>  ' + newpath+marker,
 
137
                                     _('renamed') ])
132
138
 
133
139
        for path, id, kind, text_modified, meta_modified in self.delta.modified:
134
 
            self.file_store.append([ True, path, _('modified') ])
 
140
            marker = osutils.kind_marker(kind)
 
141
            self.file_store.append([ True, path+marker, _('modified') ])
135
142
    
136
143
    def _create_pending_merges(self):
137
144
        liststore = gtk.ListStore(gobject.TYPE_STRING,