/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/patch.py

  • Committer: Martin Pool
  • Date: 2005-09-22 05:29:31 UTC
  • Revision ID: mbp@sourcefrog.net-20050922052931-b8afc00ea792942c
- write working inventory into final location

- set branch format indicator after upgrade

- cleanup unused files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patch.py
1
 
import errno
2
1
import os
3
2
from subprocess import Popen, PIPE
4
 
 
5
 
from bzrlib.errors import NoDiff3
6
3
"""
7
4
Diff and patch functionality
8
5
"""
9
6
__docformat__ = "restructuredtext"
10
7
 
11
8
def write_to_cmd(args, input=""):
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
 
 
 
9
    process = Popen(args, bufsize=len(input), stdin=PIPE, stdout=PIPE,
 
10
                    stderr=PIPE, close_fds=True)
19
11
    stdout, stderr = process.communicate(input)
20
12
    status = process.wait()
21
13
    if status < 0:
56
48
    add_label(args, "ANCESTOR")
57
49
    add_label(args, "MERGE-SOURCE")
58
50
    args.extend((mine_path, older_path, yours_path))
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
 
51
    output, stderr, status = write_to_cmd(args)
66
52
    if status not in (0, 1):
67
53
        raise Exception(stderr)
68
54
    file(out_file, "wb").write(output)