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
18
from subprocess import Popen, PIPE
19
from urlparse import urlsplit, urlunsplit
21
from bzrlib import urlutils
22
from bzrlib.transport import get_transport
23
from bzrlib.workingtree import WorkingTree
22
from bzrlib.plugins.bzrtools.bzrtools import open_from_url
23
from errors import PatchFailed, PatchInvokeError
25
def patch(tree, location, strip, quiet=False):
26
def patch(tree, location, strip):
26
27
"""Apply a patch to a branch, using patch(1). URLs may be used."""
28
29
if location is None:
29
30
my_file = sys.stdin
31
my_file = open_from_url(location)
32
patches = [my_file.read()]
33
return run_patch(tree.basedir, patches, strip, quiet=quiet)
36
def run_patch(directory, patches, strip=0, reverse=False, dry_run=False,
37
quiet=False, _patch_cmd='patch', target_file=None):
38
args = [_patch_cmd, '-d', directory, '-s', '-p%d' % strip, '-f']
40
args.append('--quiet')
42
if sys.platform == "win32":
43
args.append('--binary')
48
if sys.platform.startswith('freebsd'):
49
args.append('--check')
51
args.append('--dry-run')
52
stderr = subprocess.PIPE
55
if target_file is not None:
56
args.append(target_file)
59
process = subprocess.Popen(args, stdin=subprocess.PIPE,
60
stdout=subprocess.PIPE, stderr=stderr)
62
raise PatchInvokeError(e)
65
process.stdin.write(str(patch))
69
raise PatchInvokeError(e, process.stderr.read())
71
result = process.wait()
73
sys.stdout.write(process.stdout.read())
32
location = urlutils.normalize_url(location)
33
(scheme, loc, path, query, fragment) = urlsplit(location)
34
loc_start = urlunsplit((scheme, loc, '/', '', ''))
35
my_file = get_transport(loc_start).get(path[1:])
36
cmd = ['patch', '--directory', tree.basedir, '--strip', str(strip)]
38
child_proc = Popen(cmd, stdin=PIPE)
40
child_proc.stdin.write(line)
41
child_proc.stdin.close()