← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patch.py

Factor out another win32 special case and add platform independent tests for it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patch.py
 
1
import errno
1
2
import os
2
3
from subprocess import Popen, PIPE
 
4
 
 
5
from bzrlib.errors import NoDiff3
 
6
from bzrlib.textfile import check_text_path
3
7
"""
4
8
Diff and patch functionality
5
9
"""
6
10
__docformat__ = "restructuredtext"
7
11
 
8
12
def write_to_cmd(args, input=""):
9
 
    process = Popen(args, bufsize=len(input), stdin=PIPE, stdout=PIPE,
10
 
                    stderr=PIPE, close_fds=True)
 
13
    if os.name != 'nt':
 
14
        process = Popen(args, bufsize=len(input), stdin=PIPE, stdout=PIPE,
 
15
                        stderr=PIPE, close_fds=True)
 
16
    else:
 
17
        process = Popen(args, bufsize=len(input), stdin=PIPE, stdout=PIPE,
 
18
                        stderr=PIPE)
 
19
 
11
20
    stdout, stderr = process.communicate(input)
12
21
    status = process.wait()
13
22
    if status < 0:
43
52
def diff3(out_file, mine_path, older_path, yours_path):
44
53
    def add_label(args, label):
45
54
        args.extend(("-L", label))
 
55
    check_text_path(mine_path)
 
56
    check_text_path(older_path)
 
57
    check_text_path(yours_path)
46
58
    args = ['diff3', "-E", "--merge"]
47
59
    add_label(args, "TREE")
48
60
    add_label(args, "ANCESTOR")
49
61
    add_label(args, "MERGE-SOURCE")
50
62
    args.extend((mine_path, older_path, yours_path))
51
 
    output, stderr, status = write_to_cmd(args)
 
63
    try:
 
64
        output, stderr, status = write_to_cmd(args)
 
65
    except OSError, e:
 
66
        if e.errno == errno.ENOENT:
 
67
            raise NoDiff3
 
68
        else:
 
69
            raise
52
70
    if status not in (0, 1):
53
71
        raise Exception(stderr)
54
72
    file(out_file, "wb").write(output)