/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: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patch.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
17
 
19
18
import errno
20
19
import os
21
20
from subprocess import Popen, PIPE
22
21
 
23
 
from .errors import NoDiff3
24
 
from .textfile import check_text_path
 
22
from bzrlib.errors import NoDiff3
 
23
from bzrlib.textfile import check_text_path
25
24
 
26
25
"""Diff and patch functionality"""
27
26
 
89
88
    args.extend((mine_path, older_path, yours_path))
90
89
    try:
91
90
        output, stderr, status = write_to_cmd(args)
92
 
    except OSError as e:
 
91
    except OSError, e:
93
92
        if e.errno == errno.ENOENT:
94
93
            raise NoDiff3
95
94
        else: