[Pkg-bazaar-commits] ./bzr-gtk/unstable r254: Merge gconflicts fixes from dato.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 254
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-08-02 18:39:34 +0100
message:
  Merge gconflicts fixes from dato.
modified:
  __init__.py
  conflicts.py
    ------------------------------------------------------------
    revno: 242.1.1
    committer: Adeodato Simó <dato at net.com.org.es>
    branch nick: bzr-gtk
    timestamp: Tue 2007-07-31 19:11:00 +0200
    message:
      Use subprocess.Popen() instead of os.system().
    modified:
      conflicts.py
    ------------------------------------------------------------
    revno: 242.1.2
    committer: Adeodato Simó <dato at net.com.org.es>
    branch nick: bzr-gtk
    timestamp: Tue 2007-07-31 19:13:40 +0200
    message:
      Fix gconflicts docstring.
    modified:
      __init__.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2007-07-23 20:44:26 +0000
+++ b/__init__.py	2007-08-02 17:39:34 +0000
@@ -20,7 +20,7 @@
 gbranch           GTK+ branching. 
 gcheckout         GTK+ checkout. 
 gcommit           GTK+ commit dialog 
-gconflicts        GTK+ push. 
+gconflicts        GTK+ conflicts. 
 gdiff             Show differences in working tree in a GTK+ Window. 
 ginit             Initialise a new branch.
 gmissing          GTK+ missing revisions dialog. 
@@ -384,8 +384,10 @@
 
 
 class cmd_gconflicts(GTKCommand):
-    """ GTK+ push.
+    """ GTK+ conflicts.
     
+    Select files from the list of conflicts and run an external utility to
+    resolve them.
     """
     def run(self):
         (wt, path) = workingtree.WorkingTree.open_containing('.')

=== modified file 'conflicts.py'
--- a/conflicts.py	2007-02-03 17:19:29 +0000
+++ b/conflicts.py	2007-07-31 17:11:00 +0000
@@ -20,7 +20,7 @@
 except:
     pass
 
-import os
+import subprocess
 
 import gtk
 import gobject
@@ -166,7 +166,11 @@
             base = self.wt.abspath(selected) + '.BASE'
             this = self.wt.abspath(selected) + '.THIS'
             other = self.wt.abspath(selected) + '.OTHER'
-            os.system(self._entry_diff3.get_text() + ' ' + base + ' ' + this + ' ' + other)
+            try:
+                p = subprocess.Popen([ self._entry_diff3.get_text(), base, this, other ])
+                p.wait()
+            except OSError, e:
+                warning_dialog(_('Call to external utility failed'), str(e))
         else:
             warning_dialog(_('Cannot resolve conflict'),
                            _('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.'))