← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Aaron Bentley
  • Date: 2007-08-15 00:16:56 UTC
  • mto: This revision was merged to the branch mainline in revision 576.
  • Revision ID: aaron.bentley@utoronto.ca-20070815001656-keq7zwi3fx2ljnqc
Update version

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf.py
2
2
import sys
3
3
import subprocess
4
4
from datetime import datetime
5
 
from errors import CommandError, PatchFailed
 
5
from errors import CommandError, PatchFailed, PatchInvokeError
6
6
from hunk_selector import ShelveHunkSelector, UnshelveHunkSelector
7
7
from patchsource import PatchSource, FilePatchSource
8
8
from bzrlib.osutils import rename
251
251
            args.append('-R')
252
252
        if dry_run:
253
253
            args.append('--dry-run')
254
 
            stdout = stderr = subprocess.PIPE
 
254
            stderr = subprocess.PIPE
255
255
        else:
256
 
            stdout = stderr = None
257
 
 
258
 
        process = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=stdout,
259
 
                        stderr=stderr)
260
 
        for patch in patches:
261
 
            process.stdin.write(str(patch))
262
 
 
263
 
        process.communicate()
 
256
            stderr = None
 
257
 
 
258
        try:
 
259
            process = subprocess.Popen(args, stdin=subprocess.PIPE,
 
260
                                       stdout=subprocess.PIPE, stderr=stderr)
 
261
            for patch in patches:
 
262
                process.stdin.write(str(patch))
 
263
            process.stdin.close()
 
264
 
 
265
        except IOError, e:
 
266
            raise PatchInvokeError(e, process.stderr.read())
264
267
 
265
268
        result = process.wait()
 
269
        if not dry_run:
 
270
            sys.stdout.write(process.stdout.read())
266
271
        if result != 0:
267
272
            raise PatchFailed()
268
273