← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patch.py

  • Committer: Robert Collins
  • Date: 2006-03-06 07:14:27 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060306071427-359ef15c1d891e84
Add total_size to the revision_store api.

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
3
6
"""
4
7
Diff and patch functionality
5
8
"""
6
9
__docformat__ = "restructuredtext"
7
10
 
8
11
def write_to_cmd(args, input=""):
9
 
    process = Popen(args, bufsize=len(input), stdin=PIPE, stdout=PIPE,
10
 
                    stderr=PIPE, close_fds=True)
 
12
    if os.name != 'nt':
 
13
        process = Popen(args, bufsize=len(input), stdin=PIPE, stdout=PIPE,
 
14
                        stderr=PIPE, close_fds=True)
 
15
    else:
 
16
        process = Popen(args, bufsize=len(input), stdin=PIPE, stdout=PIPE,
 
17
                        stderr=PIPE)
 
18
 
11
19
    stdout, stderr = process.communicate(input)
12
20
    status = process.wait()
13
21
    if status < 0:
48
56
    add_label(args, "ANCESTOR")
49
57
    add_label(args, "MERGE-SOURCE")
50
58
    args.extend((mine_path, older_path, yours_path))
51
 
    output, stderr, status = write_to_cmd(args)
 
59
    try:
 
60
        output, stderr, status = write_to_cmd(args)
 
61
    except OSError, e:
 
62
        if e.errno == errno.ENOENT:
 
63
            raise NoDiff3
 
64
        else:
 
65
            raise
52
66
    if status not in (0, 1):
53
67
        raise Exception(stderr)
54
68
    file(out_file, "wb").write(output)