← 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-10-29 18:40:48 UTC
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: abentley@panoramicfeedback.com-20051029184048-88c7e2e0fc56481f
Updated GPL notices

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
 
from bzrlib.transport import get_transport
20
 
from urlparse import urlsplit, urlunsplit
21
 
def patch(branch, location, strip):
22
 
    """Apply a patch to a branch, using patch(1).  URLs may be used."""
23
 
    my_file = None
24
 
    if location is None:
 
19
def patch(branch, filename, strip):
 
20
    """Apply a patch to a branch, using patch(1)."""
 
21
    if filename is None:
25
22
        my_file = sys.stdin
26
23
    else:
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')
 
24
        my_file = file(filename, 'rb')
35
25
    cmd = ['patch', '--directory', branch.base, '--strip', str(strip)]
36
26
    child_proc = Popen(cmd, stdin=PIPE)
37
27
    for line in my_file: