← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to patch.py

  • Committer: Aaron Bentley
  • Date: 2007-03-09 18:25:10 UTC
  • mto: This revision was merged to the branch mainline in revision 520.
  • Revision ID: abentley@panoramicfeedback.com-20070309182510-fkj1j6t119d1cj5q
Handle broken python tar implementations

Show diffs side-by-side

added added

removed removed

Lines of Context:
patch.py
1
 
# Copyright (C) 2005, 2008 Aaron Bentley, 2006 Michael Ellerman
2
 
# <aaron@aaronbentley.com>
 
1
# Copyright (C) 2005 Aaron Bentley
 
2
# <aaron.bentley@utoronto.ca>
3
3
#
4
4
#    This program is free software; you can redistribute it and/or modify
5
5
#    it under the terms of the GNU General Public License as published by
15
15
#    along with this program; if not, write to the Free Software
16
16
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
import sys
18
 
import subprocess
 
18
from subprocess import Popen, PIPE
19
19
 
 
20
from bzrlib import urlutils
 
21
from bzrlib.transport import get_transport
20
22
from bzrlib.workingtree import WorkingTree
21
23
import bzrlib.add
22
24
 
23
 
from bzrlib.plugins.bzrtools.bzrtools import open_from_url
24
 
from errors import CommandError, PatchFailed, PatchInvokeError
25
 
 
26
25
def patch(tree, location, strip, quiet=False):
27
26
    """Apply a patch to a branch, using patch(1).  URLs may be used."""
28
27
    my_file = None
29
28
    if location is None:
30
29
        my_file = sys.stdin
31
30
    else:
32
 
        my_file = open_from_url(location)
33
 
    patches = [my_file.read()]
34
 
    return run_patch(tree.basedir, patches, strip, quiet=quiet)
35
 
 
36
 
 
37
 
def run_patch(directory, patches, strip=0, reverse=False, dry_run=False,
38
 
              quiet=False, _patch_cmd='patch'):
39
 
    args = [_patch_cmd, '-d', directory, '-s', '-p%d' % strip, '-f']
 
31
        location = urlutils.normalize_url(location)
 
32
        dirname, basename = urlutils.split(location)
 
33
        my_file = get_transport(dirname).get(basename)
 
34
    cmd = ['patch', '--directory', tree.basedir, '--strip', str(strip)]
40
35
    if quiet:
41
 
        args.append('--quiet')
42
 
 
43
 
    if sys.platform == "win32":
44
 
        args.append('--binary')
45
 
 
46
 
    if reverse:
47
 
        args.append('-R')
48
 
    if dry_run:
49
 
        if sys.platform.startswith('freebsd'):
50
 
            args.append('--check')
51
 
        else:
52
 
            args.append('--dry-run')
53
 
        stderr = subprocess.PIPE
54
 
    else:
55
 
        stderr = None
56
 
 
57
 
    try:
58
 
        process = subprocess.Popen(args, stdin=subprocess.PIPE,
59
 
                                   stdout=subprocess.PIPE, stderr=stderr)
60
 
    except OSError, e:
61
 
        raise PatchInvokeError(e)
62
 
    try:
63
 
        for patch in patches:
64
 
            process.stdin.write(str(patch))
65
 
        process.stdin.close()
66
 
 
67
 
    except IOError, e:
68
 
        raise PatchInvokeError(e, process.stderr.read())
69
 
 
70
 
    result = process.wait()
71
 
    if not dry_run:
72
 
        sys.stdout.write(process.stdout.read())
73
 
    if result != 0:
74
 
        raise PatchFailed()
75
 
 
76
 
    return result
 
36
        cmd.append('--quiet')
 
37
    r = 0
 
38
    child_proc = Popen(cmd, stdin=PIPE)
 
39
    for line in my_file:
 
40
        child_proc.stdin.write(line)
 
41
    child_proc.stdin.close()
 
42
    r = child_proc.wait()
 
43
    return r