← 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-07-30 14:26:46 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070730142646-te0ta96nlwo2yn5c
Add bug re: branches/redirects

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 urlparse import urlsplit, urlunsplit
20
19
 
21
 
from bzrlib import urlutils
22
 
from bzrlib.transport import get_transport
23
20
from bzrlib.workingtree import WorkingTree
24
21
import bzrlib.add
25
22
 
26
 
def patch(tree, location, strip):
 
23
from bzrlib.plugins.bzrtools.bzrtools import open_from_url
 
24
 
 
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
 
        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:])
 
31
        my_file = open_from_url(location)
36
32
    cmd = ['patch', '--directory', tree.basedir, '--strip', str(strip)]
 
33
    if quiet:
 
34
        cmd.append('--quiet')
37
35
    r = 0
38
36
    child_proc = Popen(cmd, stdin=PIPE)
39
37
    for line in my_file: