← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patch.py

  • Committer: Martin Pool
  • Date: 2005-05-19 08:31:06 UTC
  • Revision ID: mbp@sourcefrog.net-20050519083106-ebe71562d3bda4a7
- fix typo

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patch.py
1
1
import os
2
 
from subprocess import Popen, PIPE
 
2
import popen2
3
3
"""
4
4
Diff and patch functionality
5
5
"""
6
6
__docformat__ = "restructuredtext"
7
7
 
8
 
def write_to_cmd(args, input=""):
9
 
    process = Popen(args, bufsize=len(input), stdin=PIPE, stdout=PIPE,
10
 
                    stderr=PIPE, close_fds=True)
11
 
    stdout, stderr = process.communicate(input)
12
 
    status = process.wait()
13
 
    if status < 0:
14
 
        raise Exception("%s killed by signal %i" (args[0], -status))
15
 
    return stdout, stderr, status
16
 
    
17
 
 
18
8
def patch(patch_contents, filename, output_filename=None, reverse=False):
19
9
    """Apply a patch to a file, to produce another output file.  This is should
20
10
    be suitable for our limited purposes.
36
26
    if output_filename is not None:
37
27
        args.extend(("-o", output_filename))
38
28
    args.append(filename)
39
 
    stdout, stderr, status = write_to_cmd(args, patch_contents)
 
29
    process = popen2.Popen3(args, bufsize=len(patch_contents))
 
30
    process.tochild.write(patch_contents)
 
31
    process.tochild.close()
 
32
    status = os.WEXITSTATUS(process.wait())
40
33
    return status 
41
34
 
42
35
 
56
49
    if orig_label is not None and mod_label is not None:
57
50
        args.extend(("-L", orig_label, "-L", mod_label))
58
51
    args.extend(("--", orig_file, "-"))
59
 
    patch, stderr, status = write_to_cmd(args, mod_str)
 
52
    process = popen2.Popen3(args, bufsize=len(mod_str))
 
53
    process.tochild.write(mod_str)
 
54
    process.tochild.close()
 
55
    patch = process.fromchild.read()
 
56
    status = os.WEXITSTATUS(process.wait())
60
57
    if status == 0:
61
58
        return None
62
59
    else:
70
67
    add_label(args, "ANCESTOR")
71
68
    add_label(args, "MERGE-SOURCE")
72
69
    args.extend((mine_path, older_path, yours_path))
73
 
    output, stderr, status = write_to_cmd(args)
 
70
    process = popen2.Popen4(args)
 
71
    process.tochild.close()
 
72
    output = process.fromchild.read()
 
73
    status = os.WEXITSTATUS(process.wait())
74
74
    if status not in (0, 1):
75
 
        raise Exception(stderr)
 
75
        raise Exception(output)
76
76
    file(out_file, "wb").write(output)
77
77
    return status