/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: 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:
conflicts.py
20
20
except:
21
21
    pass
22
22
 
23
 
import os
 
23
import subprocess
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)
103
104
        else:
104
105
            self.model = gtk.ListStore(gobject.TYPE_STRING,
105
106
                                       gobject.TYPE_STRING,
166
167
            base = self.wt.abspath(selected) + '.BASE'
167
168
            this = self.wt.abspath(selected) + '.THIS'
168
169
            other = self.wt.abspath(selected) + '.OTHER'
169
 
            os.system(self._entry_diff3.get_text() + ' ' + base + ' ' + this + ' ' + 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))
170
175
        else:
171
176
            warning_dialog(_('Cannot resolve conflict'),
172
177
                           _('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.'))