← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to patch.py

  • Committer: Aaron Bentley
  • Date: 2005-12-03 23:53:59 UTC
  • mto: (147.4.30 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: aaron.bentley@utoronto.ca-20051203235359-5134805afd538781
Recorded Robey's bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
patch.py
16
16
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
import sys
18
18
from subprocess import Popen, PIPE
19
 
 
20
 
from bzrlib import urlutils
21
19
from bzrlib.transport import get_transport
22
 
from bzrlib.workingtree import WorkingTree
23
 
import bzrlib.add
24
 
 
25
 
def patch(tree, location, strip, quiet=False):
 
20
from urlparse import urlsplit, urlunsplit
 
21
def patch(branch, location, strip):
26
22
    """Apply a patch to a branch, using patch(1).  URLs may be used."""
27
23
    my_file = None
28
24
    if location is None:
29
25
        my_file = sys.stdin
30
26
    else:
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)]
35
 
    if quiet:
36
 
        cmd.append('--quiet')
37
 
    r = 0
 
27
        for prefix in ('http://', 'sftp://', 'file://'):
 
28
            if not location.startswith(prefix):
 
29
                continue
 
30
            (scheme, loc, path, query, fragment) = urlsplit(location)
 
31
            loc_start = urlunsplit((scheme, loc, '/', '', ''))
 
32
            my_file = get_transport(loc_start).get(path[1:])
 
33
        if my_file is None:
 
34
            my_file = file(location, 'rb')
 
35
    cmd = ['patch', '--directory', branch.base, '--strip', str(strip)]
38
36
    child_proc = Popen(cmd, stdin=PIPE)
39
37
    for line in my_file:
40
38
        child_proc.stdin.write(line)
41
39
    child_proc.stdin.close()
42
 
    r = child_proc.wait()
43
 
    return r
 
40
    return child_proc.wait()