Add an option to delete a patch from a certain branch

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index 6b7eb83..3137797 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -114,7 +114,7 @@ def get_conflicts():
         return None
 
 def _input(cmd, file_desc):
-    p = popen2.Popen3(cmd)
+    p = popen2.Popen3(cmd, True)
     while True:
         line = file_desc.readline()
         if not line:
@@ -125,14 +125,14 @@ def _input(cmd, file_desc):
         raise GitException, '%s failed' % str(cmd)
 
 def _output(cmd):
-    p=popen2.Popen3(cmd)
+    p=popen2.Popen3(cmd, True)
     string = p.fromchild.read()
     if p.wait():
         raise GitException, '%s failed' % str(cmd)
     return string
 
 def _output_one_line(cmd, file_desc = None):
-    p=popen2.Popen3(cmd)
+    p=popen2.Popen3(cmd, True)
     if file_desc != None:
         for line in file_desc:
             p.tochild.write(line)
@@ -143,7 +143,7 @@ def _output_one_line(cmd, file_desc = None):
     return string
 
 def _output_lines(cmd):
-    p=popen2.Popen3(cmd)
+    p=popen2.Popen3(cmd, True)
     lines = p.fromchild.readlines()
     if p.wait():
         raise GitException, '%s failed' % str(cmd)
@@ -470,7 +470,7 @@ def merge(base, head1, head2):
         raise GitException, 'git-read-tree failed (local changes maybe?)'
 
     # this can fail if there are conflicts
-    if os.system('git-merge-index -o -q gitmergeonefile.py -a') != 0:
+    if __run('git-merge-index -o -q gitmergeonefile.py -a') != 0:
         raise GitException, 'git-merge-index failed (possible conflicts)'
 
 def status(files = [], modified = False, new = False, deleted = False,