← 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-06-12 22:09:44 UTC
  • mfrom: (540.1.2 bzrtools-0.17)
  • Revision ID: aaron.bentley@utoronto.ca-20070612220944-5zw4hlzp1ctq6mkl
Merge fixes from 0.17

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