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

  • Committer: Jelmer Vernooij
  • Date: 2007-07-15 15:22:29 UTC
  • Revision ID: jelmer@samba.org-20070715152229-clmlen0vpd8d2pzx
Add docstrings, remove unused code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
conflicts.py
20
20
except:
21
21
    pass
22
22
 
23
 
import subprocess
 
23
import os
24
24
 
25
25
import gtk
26
26
import gobject
100
100
                                         gtk.CellRendererText(), text=0))
101
101
            self._treeview.set_headers_visible(False)            
102
102
            self.model.append([ _("No conflicts in working tree.") ])
103
 
            self._button_diff3.set_sensitive(False)
104
103
        else:
105
104
            self.model = gtk.ListStore(gobject.TYPE_STRING,
106
105
                                       gobject.TYPE_STRING,
167
166
            base = self.wt.abspath(selected) + '.BASE'
168
167
            this = self.wt.abspath(selected) + '.THIS'
169
168
            other = self.wt.abspath(selected) + '.OTHER'
170
 
            try:
171
 
                p = subprocess.Popen([ self._entry_diff3.get_text(), base, this, other ])
172
 
                p.wait()
173
 
            except OSError, e:
174
 
                warning_dialog(_('Call to external utility failed'), str(e))
 
169
            os.system(self._entry_diff3.get_text() + ' ' + base + ' ' + this + ' ' + other)
175
170
        else:
176
171
            warning_dialog(_('Cannot resolve conflict'),
177
172
                           _('Only conflicts on the text of files can be resolved with Olive at the moment. Content conflicts, on the structure of the tree, need to be resolved using the command line.'))