/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 breezy/diff.py

  • Committer: Jelmer Vernooij
  • Date: 2018-09-30 00:33:53 UTC
  • mto: This revision was merged to the branch mainline in revision 7134.
  • Revision ID: jelmer@jelmer.uk-20180930003353-2z5sugalbxfxfiru
When opening working trees with .git files, open the right control transport.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd.
 
1
# Copyright (C) 2005-2014 Canonical Ltd.
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
import difflib
18
20
import os
19
21
import re
20
22
import string
21
23
import sys
22
24
 
23
 
from bzrlib.lazy_import import lazy_import
 
25
from .lazy_import import lazy_import
24
26
lazy_import(globals(), """
25
27
import errno
26
28
import subprocess
27
29
import tempfile
28
 
import time
29
30
 
30
 
from bzrlib import (
31
 
    branch as _mod_branch,
32
 
    bzrdir,
 
31
from breezy import (
 
32
    cleanup,
33
33
    cmdline,
34
 
    cleanup,
 
34
    controldir,
35
35
    errors,
36
36
    osutils,
37
37
    patiencediff,
40
40
    views,
41
41
    )
42
42
 
43
 
from bzrlib.workingtree import WorkingTree
 
43
from breezy.workingtree import WorkingTree
 
44
from breezy.i18n import gettext
44
45
""")
45
46
 
46
 
from bzrlib.registry import (
 
47
from .registry import (
47
48
    Registry,
48
49
    )
49
 
from bzrlib.symbol_versioning import (
50
 
    deprecated_function,
51
 
    deprecated_in,
52
 
    )
53
 
from bzrlib.trace import mutter, note, warning
54
 
 
 
50
from .sixish import text_type
 
51
from .trace import mutter, note, warning
 
52
from .tree import FileTimestampUnavailable
 
53
 
 
54
 
 
55
DEFAULT_CONTEXT_AMOUNT = 3
55
56
 
56
57
class AtTemplate(string.Template):
57
58
    """Templating class that uses @ instead of $."""
73
74
        self.opcodes = None
74
75
 
75
76
 
76
 
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
 
77
def internal_diff(old_label, oldlines, new_label, newlines, to_file,
77
78
                  allow_binary=False, sequence_matcher=None,
78
 
                  path_encoding='utf8'):
 
79
                  path_encoding='utf8', context_lines=DEFAULT_CONTEXT_AMOUNT):
79
80
    # FIXME: difflib is wrong if there is no trailing newline.
80
81
    # The syntax used by patch seems to be "\ No newline at
81
82
    # end of file" following the last diff line from that
86
87
    # In the meantime we at least make sure the patch isn't
87
88
    # mangled.
88
89
 
89
 
 
90
 
    # Special workaround for Python2.3, where difflib fails if
91
 
    # both sequences are empty.
92
 
    if not oldlines and not newlines:
93
 
        return
94
 
 
95
90
    if allow_binary is False:
96
91
        textfile.check_text_lines(oldlines)
97
92
        textfile.check_text_lines(newlines)
98
93
 
99
94
    if sequence_matcher is None:
100
95
        sequence_matcher = patiencediff.PatienceSequenceMatcher
101
 
    ud = patiencediff.unified_diff(oldlines, newlines,
102
 
                      fromfile=old_filename.encode(path_encoding),
103
 
                      tofile=new_filename.encode(path_encoding),
104
 
                      sequencematcher=sequence_matcher)
 
96
    ud = patiencediff.unified_diff_bytes(oldlines, newlines,
 
97
                      fromfile=old_label.encode(path_encoding, 'replace'),
 
98
                      tofile=new_label.encode(path_encoding, 'replace'),
 
99
                      n=context_lines, sequencematcher=sequence_matcher)
105
100
 
106
101
    ud = list(ud)
107
102
    if len(ud) == 0: # Identical contents, nothing to do
109
104
    # work-around for difflib being too smart for its own good
110
105
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
111
106
    if not oldlines:
112
 
        ud[2] = ud[2].replace('-1,0', '-0,0')
 
107
        ud[2] = ud[2].replace(b'-1,0', b'-0,0')
113
108
    elif not newlines:
114
 
        ud[2] = ud[2].replace('+1,0', '+0,0')
 
109
        ud[2] = ud[2].replace(b'+1,0', b'+0,0')
115
110
 
116
111
    for line in ud:
117
112
        to_file.write(line)
118
 
        if not line.endswith('\n'):
119
 
            to_file.write("\n\\ No newline at end of file\n")
120
 
    to_file.write('\n')
 
113
        if not line.endswith(b'\n'):
 
114
            to_file.write(b"\n\\ No newline at end of file\n")
 
115
    to_file.write(b'\n')
121
116
 
122
117
 
123
118
def _spawn_external_diff(diffcmd, capture_errors=True):
124
 
    """Spawn the externall diff process, and return the child handle.
 
119
    """Spawn the external diff process, and return the child handle.
125
120
 
126
121
    :param diffcmd: The command list to spawn
127
122
    :param capture_errors: Capture stderr as well as setting LANG=C
149
144
                                stdout=subprocess.PIPE,
150
145
                                stderr=stderr,
151
146
                                env=env)
152
 
    except OSError, e:
 
147
    except OSError as e:
153
148
        if e.errno == errno.ENOENT:
154
149
            raise errors.NoDiff(str(e))
155
150
        raise
156
151
 
157
152
    return pipe
158
153
 
159
 
 
160
 
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
 
154
# diff style options as of GNU diff v3.2
 
155
style_option_list = ['-c', '-C', '--context',
 
156
                     '-e', '--ed',
 
157
                     '-f', '--forward-ed',
 
158
                     '-q', '--brief',
 
159
                     '--normal',
 
160
                     '-n', '--rcs',
 
161
                     '-u', '-U', '--unified',
 
162
                     '-y', '--side-by-side',
 
163
                     '-D', '--ifdef']
 
164
 
 
165
def default_style_unified(diff_opts):
 
166
    """Default to unified diff style if alternative not specified in diff_opts.
 
167
 
 
168
        diff only allows one style to be specified; they don't override.
 
169
        Note that some of these take optargs, and the optargs can be
 
170
        directly appended to the options.
 
171
        This is only an approximate parser; it doesn't properly understand
 
172
        the grammar.
 
173
 
 
174
    :param diff_opts: List of options for external (GNU) diff.
 
175
    :return: List of options with default style=='unified'.
 
176
    """
 
177
    for s in style_option_list:
 
178
        for j in diff_opts:
 
179
            if j.startswith(s):
 
180
                break
 
181
        else:
 
182
            continue
 
183
        break
 
184
    else:
 
185
        diff_opts.append('-u')
 
186
    return diff_opts
 
187
 
 
188
 
 
189
def external_diff(old_label, oldlines, new_label, newlines, to_file,
161
190
                  diff_opts):
162
191
    """Display a diff by calling out to the external diff program."""
163
192
    # make sure our own output is properly ordered before the diff
164
193
    to_file.flush()
165
194
 
166
 
    oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
167
 
    newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
 
195
    oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='brz-diff-old-')
 
196
    newtmp_fd, new_abspath = tempfile.mkstemp(prefix='brz-diff-new-')
168
197
    oldtmpf = os.fdopen(oldtmp_fd, 'wb')
169
198
    newtmpf = os.fdopen(newtmp_fd, 'wb')
170
199
 
187
216
        if sys.platform == 'win32':
188
217
            # Popen doesn't do the proper encoding for external commands
189
218
            # Since we are dealing with an ANSI api, use mbcs encoding
190
 
            old_filename = old_filename.encode('mbcs')
191
 
            new_filename = new_filename.encode('mbcs')
 
219
            old_label = old_label.encode('mbcs')
 
220
            new_label = new_label.encode('mbcs')
192
221
        diffcmd = ['diff',
193
 
                   '--label', old_filename,
 
222
                   '--label', old_label,
194
223
                   old_abspath,
195
 
                   '--label', new_filename,
 
224
                   '--label', new_label,
196
225
                   new_abspath,
197
226
                   '--binary',
198
227
                  ]
199
228
 
200
 
        # diff only allows one style to be specified; they don't override.
201
 
        # note that some of these take optargs, and the optargs can be
202
 
        # directly appended to the options.
203
 
        # this is only an approximate parser; it doesn't properly understand
204
 
        # the grammar.
205
 
        for s in ['-c', '-u', '-C', '-U',
206
 
                  '-e', '--ed',
207
 
                  '-q', '--brief',
208
 
                  '--normal',
209
 
                  '-n', '--rcs',
210
 
                  '-y', '--side-by-side',
211
 
                  '-D', '--ifdef']:
212
 
            for j in diff_opts:
213
 
                if j.startswith(s):
214
 
                    break
215
 
            else:
216
 
                continue
217
 
            break
218
 
        else:
219
 
            diffcmd.append('-u')
 
229
        diff_opts = default_style_unified(diff_opts)
220
230
 
221
231
        if diff_opts:
222
232
            diffcmd.extend(diff_opts)
223
233
 
224
234
        pipe = _spawn_external_diff(diffcmd, capture_errors=True)
225
 
        out,err = pipe.communicate()
 
235
        out, err = pipe.communicate()
226
236
        rc = pipe.returncode
227
237
 
228
238
        # internal_diff() adds a trailing newline, add one here for consistency
229
 
        out += '\n'
 
239
        out += b'\n'
230
240
        if rc == 2:
231
241
            # 'diff' gives retcode == 2 for all sorts of errors
232
242
            # one of those is 'Binary files differ'.
239
249
            out, err = pipe.communicate()
240
250
 
241
251
            # Write out the new i18n diff response
242
 
            to_file.write(out+'\n')
 
252
            to_file.write(out+b'\n')
243
253
            if pipe.returncode != 2:
244
254
                raise errors.BzrError(
245
255
                               'external diff failed with exit code 2'
246
256
                               ' when run with LANG=C and LC_ALL=C,'
247
257
                               ' but not when run natively: %r' % (diffcmd,))
248
258
 
249
 
            first_line = lang_c_out.split('\n', 1)[0]
 
259
            first_line = lang_c_out.split(b'\n', 1)[0]
250
260
            # Starting with diffutils 2.8.4 the word "binary" was dropped.
251
 
            m = re.match('^(binary )?files.*differ$', first_line, re.I)
 
261
            m = re.match(b'^(binary )?files.*differ$', first_line, re.I)
252
262
            if m is None:
253
263
                raise errors.BzrError('external diff failed with exit code 2;'
254
264
                                      ' command: %r' % (diffcmd,))
267
277
                msg = 'exit code %d' % rc
268
278
 
269
279
            raise errors.BzrError('external diff failed with %s; command: %r'
270
 
                                  % (rc, diffcmd))
 
280
                                  % (msg, diffcmd))
271
281
 
272
282
 
273
283
    finally:
274
284
        oldtmpf.close()                 # and delete
275
285
        newtmpf.close()
276
 
        # Clean up. Warn in case the files couldn't be deleted
277
 
        # (in case windows still holds the file open, but not
278
 
        # if the files have already been deleted)
279
 
        try:
280
 
            os.remove(old_abspath)
281
 
        except OSError, e:
282
 
            if e.errno not in (errno.ENOENT,):
283
 
                warning('Failed to delete temporary file: %s %s',
284
 
                        old_abspath, e)
285
 
        try:
286
 
            os.remove(new_abspath)
287
 
        except OSError:
288
 
            if e.errno not in (errno.ENOENT,):
289
 
                warning('Failed to delete temporary file: %s %s',
290
 
                        new_abspath, e)
291
 
 
292
 
 
293
 
@deprecated_function(deprecated_in((2, 2, 0)))
294
 
def get_trees_and_branches_to_diff(path_list, revision_specs, old_url, new_url,
295
 
                                   apply_view=True):
296
 
    """Get the trees and specific files to diff given a list of paths.
297
 
 
298
 
    This method works out the trees to be diff'ed and the files of
299
 
    interest within those trees.
300
 
 
301
 
    :param path_list:
302
 
        the list of arguments passed to the diff command
303
 
    :param revision_specs:
304
 
        Zero, one or two RevisionSpecs from the diff command line,
305
 
        saying what revisions to compare.
306
 
    :param old_url:
307
 
        The url of the old branch or tree. If None, the tree to use is
308
 
        taken from the first path, if any, or the current working tree.
309
 
    :param new_url:
310
 
        The url of the new branch or tree. If None, the tree to use is
311
 
        taken from the first path, if any, or the current working tree.
312
 
    :param apply_view:
313
 
        if True and a view is set, apply the view or check that the paths
314
 
        are within it
315
 
    :returns:
316
 
        a tuple of (old_tree, new_tree, old_branch, new_branch,
317
 
        specific_files, extra_trees) where extra_trees is a sequence of
318
 
        additional trees to search in for file-ids.  The trees and branches
319
 
        are not locked.
320
 
    """
321
 
    op = cleanup.OperationWithCleanups(get_trees_and_branches_to_diff_locked)
322
 
    return op.run_simple(path_list, revision_specs, old_url, new_url,
323
 
            op.add_cleanup, apply_view=apply_view)
324
 
    
 
286
 
 
287
        def cleanup(path):
 
288
            # Warn in case the file couldn't be deleted (in case windows still
 
289
            # holds the file open, but not if the files have already been
 
290
            # deleted)
 
291
            try:
 
292
                os.remove(path)
 
293
            except OSError as e:
 
294
                if e.errno not in (errno.ENOENT,):
 
295
                    warning('Failed to delete temporary file: %s %s', path, e)
 
296
 
 
297
        cleanup(old_abspath)
 
298
        cleanup(new_abspath)
 
299
 
325
300
 
326
301
def get_trees_and_branches_to_diff_locked(
327
302
    path_list, revision_specs, old_url, new_url, add_cleanup, apply_view=True):
394
369
    if old_url is None:
395
370
        old_url = default_location
396
371
    working_tree, branch, relpath = \
397
 
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
 
372
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
398
373
    lock_tree_or_branch(working_tree, branch)
399
374
    if consider_relpath and relpath != '':
400
375
        if working_tree is not None and apply_view:
408
383
        new_url = default_location
409
384
    if new_url != old_url:
410
385
        working_tree, branch, relpath = \
411
 
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
 
386
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
412
387
        lock_tree_or_branch(working_tree, branch)
413
388
        if consider_relpath and relpath != '':
414
389
            if working_tree is not None and apply_view:
420
395
 
421
396
    # Get the specific files (all files is None, no files is [])
422
397
    if make_paths_wt_relative and working_tree is not None:
423
 
        try:
424
 
            from bzrlib.builtins import safe_relpath_files
425
 
            other_paths = safe_relpath_files(working_tree, other_paths,
 
398
        other_paths = working_tree.safe_relpath_files(
 
399
            other_paths,
426
400
            apply_view=apply_view)
427
 
        except errors.FileInWrongBranch:
428
 
            raise errors.BzrCommandError("Files are in different branches")
429
401
    specific_files.extend(other_paths)
430
402
    if len(specific_files) == 0:
431
403
        specific_files = None
435
407
            if view_files:
436
408
                specific_files = view_files
437
409
                view_str = views.view_display_str(view_files)
438
 
                note("*** Ignoring files outside view. View is %s" % view_str)
 
410
                note(gettext("*** Ignoring files outside view. View is %s") % view_str)
439
411
 
440
412
    # Get extra trees that ought to be searched for file-ids
441
413
    extra_trees = None
442
414
    if working_tree is not None and working_tree not in (old_tree, new_tree):
443
415
        extra_trees = (working_tree,)
444
 
    return old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees
 
416
    return (old_tree, new_tree, old_branch, new_branch,
 
417
            specific_files, extra_trees)
445
418
 
446
419
 
447
420
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
464
437
                    extra_trees=None,
465
438
                    path_encoding='utf8',
466
439
                    using=None,
467
 
                    format_cls=None):
 
440
                    format_cls=None,
 
441
                    context=DEFAULT_CONTEXT_AMOUNT):
468
442
    """Show in text form the changes from one tree to another.
469
443
 
470
444
    :param to_file: The output stream.
471
 
    :param specific_files:Include only changes to these files - None for all
 
445
    :param specific_files: Include only changes to these files - None for all
472
446
        changes.
473
447
    :param external_diff_options: If set, use an external GNU diff and pass 
474
448
        these options.
477
451
        otherwise is supposed to be utf8
478
452
    :param format_cls: Formatter class (DiffTree subclass)
479
453
    """
 
454
    if context is None:
 
455
        context = DEFAULT_CONTEXT_AMOUNT
480
456
    if format_cls is None:
481
457
        format_cls = DiffTree
482
 
    old_tree.lock_read()
483
 
    try:
 
458
    with old_tree.lock_read():
484
459
        if extra_trees is not None:
485
460
            for tree in extra_trees:
486
461
                tree.lock_read()
489
464
            differ = format_cls.from_trees_options(old_tree, new_tree, to_file,
490
465
                                                   path_encoding,
491
466
                                                   external_diff_options,
492
 
                                                   old_label, new_label, using)
 
467
                                                   old_label, new_label, using,
 
468
                                                   context_lines=context)
493
469
            return differ.show_diff(specific_files, extra_trees)
494
470
        finally:
495
471
            new_tree.unlock()
496
472
            if extra_trees is not None:
497
473
                for tree in extra_trees:
498
474
                    tree.unlock()
499
 
    finally:
500
 
        old_tree.unlock()
501
475
 
502
476
 
503
477
def _patch_header_date(tree, file_id, path):
504
478
    """Returns a timestamp suitable for use in a patch header."""
505
479
    try:
506
 
        mtime = tree.get_file_mtime(file_id, path)
507
 
    except errors.FileTimestampUnavailable:
 
480
        mtime = tree.get_file_mtime(path, file_id)
 
481
    except FileTimestampUnavailable:
508
482
        mtime = 0
509
483
    return timestamp.format_patch_date(mtime)
510
484
 
511
485
 
512
486
def get_executable_change(old_is_x, new_is_x):
513
 
    descr = { True:"+x", False:"-x", None:"??" }
 
487
    descr = { True:b"+x", False:b"-x", None:b"??" }
514
488
    if old_is_x != new_is_x:
515
 
        return ["%s to %s" % (descr[old_is_x], descr[new_is_x],)]
 
489
        return [b"%s to %s" % (descr[old_is_x], descr[new_is_x],)]
516
490
    else:
517
491
        return []
518
492
 
623
597
        if 'symlink' not in (old_kind, new_kind):
624
598
            return self.CANNOT_DIFF
625
599
        if old_kind == 'symlink':
626
 
            old_target = self.old_tree.get_symlink_target(file_id)
 
600
            old_target = self.old_tree.get_symlink_target(old_path, file_id)
627
601
        elif old_kind is None:
628
602
            old_target = None
629
603
        else:
630
604
            return self.CANNOT_DIFF
631
605
        if new_kind == 'symlink':
632
 
            new_target = self.new_tree.get_symlink_target(file_id)
 
606
            new_target = self.new_tree.get_symlink_target(new_path, file_id)
633
607
        elif new_kind is None:
634
608
            new_target = None
635
609
        else:
638
612
 
639
613
    def diff_symlink(self, old_target, new_target):
640
614
        if old_target is None:
641
 
            self.to_file.write('=== target is %r\n' % new_target)
 
615
            self.to_file.write(b'=== target is \'%s\'\n' %
 
616
                new_target.encode(self.path_encoding, 'replace'))
642
617
        elif new_target is None:
643
 
            self.to_file.write('=== target was %r\n' % old_target)
 
618
            self.to_file.write(b'=== target was \'%s\'\n' %
 
619
                old_target.encode(self.path_encoding, 'replace'))
644
620
        else:
645
 
            self.to_file.write('=== target changed %r => %r\n' %
646
 
                              (old_target, new_target))
 
621
            self.to_file.write(b'=== target changed \'%s\' => \'%s\'\n' %
 
622
                              (old_target.encode(self.path_encoding, 'replace'),
 
623
                               new_target.encode(self.path_encoding, 'replace')))
647
624
        return self.CHANGED
648
625
 
649
626
 
653
630
    # or removed in a diff.
654
631
    EPOCH_DATE = '1970-01-01 00:00:00 +0000'
655
632
 
656
 
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
657
 
                 old_label='', new_label='', text_differ=internal_diff):
 
633
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8', 
 
634
                 old_label='', new_label='', text_differ=internal_diff, 
 
635
                 context_lines=DEFAULT_CONTEXT_AMOUNT):
658
636
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
659
637
        self.text_differ = text_differ
660
638
        self.old_label = old_label
661
639
        self.new_label = new_label
662
640
        self.path_encoding = path_encoding
 
641
        self.context_lines = context_lines
663
642
 
664
643
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
665
644
        """Compare two files in unified diff format
687
666
            to_file_id = None
688
667
        else:
689
668
            return self.CANNOT_DIFF
690
 
        from_label = '%s%s\t%s' % (self.old_label, old_path, old_date)
691
 
        to_label = '%s%s\t%s' % (self.new_label, new_path, new_date)
692
 
        return self.diff_text(from_file_id, to_file_id, from_label, to_label,
693
 
            old_path, new_path)
 
669
        from_label = '%s%s\t%s' % (self.old_label, old_path,
 
670
                old_date)
 
671
        to_label = '%s%s\t%s' % (self.new_label, new_path,
 
672
                new_date)
 
673
        return self.diff_text(old_path, new_path, from_label, to_label,
 
674
            from_file_id, to_file_id)
694
675
 
695
 
    def diff_text(self, from_file_id, to_file_id, from_label, to_label,
696
 
        from_path=None, to_path=None):
 
676
    def diff_text(self, from_path, to_path, from_label, to_label,
 
677
        from_file_id=None, to_file_id=None):
697
678
        """Diff the content of given files in two trees
698
679
 
699
 
        :param from_file_id: The id of the file in the from tree.  If None,
 
680
        :param from_path: The path in the from tree. If None,
700
681
            the file is not present in the from tree.
701
 
        :param to_file_id: The id of the file in the to tree.  This may refer
702
 
            to a different file from from_file_id.  If None,
 
682
        :param to_path: The path in the to tree. This may refer
 
683
            to a different file from from_path.  If None,
703
684
            the file is not present in the to tree.
704
 
        :param from_path: The path in the from tree or None if unknown.
705
 
        :param to_path: The path in the to tree or None if unknown.
 
685
        :param from_file_id: The id of the file in the from tree or None if
 
686
            unknown.
 
687
        :param to_file_id: The id of the file in the to tree or None if
 
688
            unknown.
706
689
        """
707
690
        def _get_text(tree, file_id, path):
708
 
            if file_id is not None:
709
 
                return tree.get_file(file_id, path).readlines()
710
 
            else:
 
691
            if file_id is None:
711
692
                return []
 
693
            return tree.get_file_lines(path, file_id)
712
694
        try:
713
695
            from_text = _get_text(self.old_tree, from_file_id, from_path)
714
696
            to_text = _get_text(self.new_tree, to_file_id, to_path)
715
697
            self.text_differ(from_label, from_text, to_label, to_text,
716
 
                             self.to_file)
 
698
                             self.to_file, path_encoding=self.path_encoding,
 
699
                             context_lines=self.context_lines)
717
700
        except errors.BinaryFile:
718
701
            self.to_file.write(
719
702
                  ("Binary files %s and %s differ\n" %
720
 
                  (from_label, to_label)).encode(self.path_encoding))
 
703
                  (from_label, to_label)).encode(self.path_encoding, 'replace'))
721
704
        return self.CHANGED
722
705
 
723
706
 
727
710
                 path_encoding='utf-8'):
728
711
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
729
712
        self.command_template = command_template
730
 
        self._root = osutils.mkdtemp(prefix='bzr-diff-')
 
713
        self._root = osutils.mkdtemp(prefix='brz-diff-')
731
714
 
732
715
    @classmethod
733
716
    def from_string(klass, command_string, old_tree, new_tree, to_file,
739
722
                     path_encoding)
740
723
 
741
724
    @classmethod
742
 
    def make_from_diff_tree(klass, command_string):
 
725
    def make_from_diff_tree(klass, command_string, external_diff_options=None):
743
726
        def from_diff_tree(diff_tree):
744
 
            return klass.from_string(command_string, diff_tree.old_tree,
 
727
            full_command_string = [command_string]
 
728
            if external_diff_options is not None:
 
729
                full_command_string += ' ' + external_diff_options
 
730
            return klass.from_string(full_command_string, diff_tree.old_tree,
745
731
                                     diff_tree.new_tree, diff_tree.to_file)
746
732
        return from_diff_tree
747
733
 
748
734
    def _get_command(self, old_path, new_path):
749
735
        my_map = {'old_path': old_path, 'new_path': new_path}
750
 
        return [AtTemplate(t).substitute(my_map) for t in
751
 
                self.command_template]
 
736
        command = [AtTemplate(t).substitute(my_map) for t in
 
737
                   self.command_template]
 
738
        if sys.platform == 'win32': # Popen doesn't accept unicode on win32
 
739
            command_encoded = []
 
740
            for c in command:
 
741
                if isinstance(c, text_type):
 
742
                    command_encoded.append(c.encode('mbcs'))
 
743
                else:
 
744
                    command_encoded.append(c)
 
745
            return command_encoded
 
746
        else:
 
747
            return command
752
748
 
753
749
    def _execute(self, old_path, new_path):
754
750
        command = self._get_command(old_path, new_path)
755
751
        try:
756
752
            proc = subprocess.Popen(command, stdout=subprocess.PIPE,
757
753
                                    cwd=self._root)
758
 
        except OSError, e:
 
754
        except OSError as e:
759
755
            if e.errno == errno.ENOENT:
760
756
                raise errors.ExecutableMissing(command[0])
761
757
            else:
762
758
                raise
763
759
        self.to_file.write(proc.stdout.read())
 
760
        proc.stdout.close()
764
761
        return proc.wait()
765
762
 
766
763
    def _try_symlink_root(self, tree, prefix):
769
766
            return False
770
767
        try:
771
768
            os.symlink(tree.abspath(''), osutils.pathjoin(self._root, prefix))
772
 
        except OSError, e:
 
769
        except OSError as e:
773
770
            if e.errno != errno.EEXIST:
774
771
                raise
775
772
        return True
776
773
 
777
 
    def _write_file(self, file_id, tree, prefix, relpath, force_temp=False,
778
 
                    allow_write=False):
 
774
    @staticmethod
 
775
    def _fenc():
 
776
        """Returns safe encoding for passing file path to diff tool"""
 
777
        if sys.platform == 'win32':
 
778
            return 'mbcs'
 
779
        else:
 
780
            # Don't fallback to 'utf-8' because subprocess may not be able to
 
781
            # handle utf-8 correctly when locale is not utf-8.
 
782
            return sys.getfilesystemencoding() or 'ascii'
 
783
 
 
784
    def _is_safepath(self, path):
 
785
        """Return true if `path` may be able to pass to subprocess."""
 
786
        fenc = self._fenc()
 
787
        try:
 
788
            return path == path.encode(fenc).decode(fenc)
 
789
        except UnicodeError:
 
790
            return False
 
791
 
 
792
    def _safe_filename(self, prefix, relpath):
 
793
        """Replace unsafe character in `relpath` then join `self._root`,
 
794
        `prefix` and `relpath`."""
 
795
        fenc = self._fenc()
 
796
        # encoded_str.replace('?', '_') may break multibyte char.
 
797
        # So we should encode, decode, then replace(u'?', u'_')
 
798
        relpath_tmp = relpath.encode(fenc, 'replace').decode(fenc, 'replace')
 
799
        relpath_tmp = relpath_tmp.replace(u'?', u'_')
 
800
        return osutils.pathjoin(self._root, prefix, relpath_tmp)
 
801
 
 
802
    def _write_file(self, relpath, tree, prefix, force_temp=False,
 
803
                    allow_write=False, file_id=None):
779
804
        if not force_temp and isinstance(tree, WorkingTree):
780
 
            return tree.abspath(tree.id2path(file_id))
781
 
        
782
 
        full_path = osutils.pathjoin(self._root, prefix, relpath)
 
805
            full_path = tree.abspath(relpath)
 
806
            if self._is_safepath(full_path):
 
807
                return full_path
 
808
 
 
809
        full_path = self._safe_filename(prefix, relpath)
783
810
        if not force_temp and self._try_symlink_root(tree, prefix):
784
811
            return full_path
785
812
        parent_dir = osutils.dirname(full_path)
786
813
        try:
787
814
            os.makedirs(parent_dir)
788
 
        except OSError, e:
 
815
        except OSError as e:
789
816
            if e.errno != errno.EEXIST:
790
817
                raise
791
 
        source = tree.get_file(file_id, relpath)
 
818
        source = tree.get_file(relpath, file_id)
792
819
        try:
793
 
            target = open(full_path, 'wb')
794
 
            try:
 
820
            with open(full_path, 'wb') as target:
795
821
                osutils.pumpfile(source, target)
796
 
            finally:
797
 
                target.close()
798
822
        finally:
799
823
            source.close()
800
824
        try:
801
 
            mtime = tree.get_file_mtime(file_id)
802
 
        except errors.FileTimestampUnavailable:
 
825
            mtime = tree.get_file_mtime(relpath, file_id)
 
826
        except FileTimestampUnavailable:
803
827
            pass
804
828
        else:
805
829
            os.utime(full_path, (mtime, mtime))
807
831
            osutils.make_readonly(full_path)
808
832
        return full_path
809
833
 
810
 
    def _prepare_files(self, file_id, old_path, new_path, force_temp=False,
811
 
                       allow_write_new=False):
812
 
        old_disk_path = self._write_file(file_id, self.old_tree, 'old',
813
 
                                         old_path, force_temp)
814
 
        new_disk_path = self._write_file(file_id, self.new_tree, 'new',
815
 
                                         new_path, force_temp,
 
834
    def _prepare_files(self, old_path, new_path, force_temp=False,
 
835
                       allow_write_new=False, file_id=None):
 
836
        old_disk_path = self._write_file(old_path, self.old_tree, 'old',
 
837
                                         force_temp, file_id=file_id)
 
838
        new_disk_path = self._write_file(new_path, self.new_tree, 'new',
 
839
                                         force_temp, file_id=file_id,
816
840
                                         allow_write=allow_write_new)
817
841
        return old_disk_path, new_disk_path
818
842
 
819
843
    def finish(self):
820
844
        try:
821
845
            osutils.rmtree(self._root)
822
 
        except OSError, e:
 
846
        except OSError as e:
823
847
            if e.errno != errno.ENOENT:
824
848
                mutter("The temporary directory \"%s\" was not "
825
849
                        "cleanly removed: %s." % (self._root, e))
828
852
        if (old_kind, new_kind) != ('file', 'file'):
829
853
            return DiffPath.CANNOT_DIFF
830
854
        (old_disk_path, new_disk_path) = self._prepare_files(
831
 
                                                file_id, old_path, new_path)
 
855
                old_path, new_path, file_id=file_id)
832
856
        self._execute(old_disk_path, new_disk_path)
833
857
 
834
 
    def edit_file(self, file_id):
 
858
    def edit_file(self, old_path, new_path, file_id=None):
835
859
        """Use this tool to edit a file.
836
860
 
837
861
        A temporary copy will be edited, and the new contents will be
840
864
        :param file_id: The id of the file to edit.
841
865
        :return: The new contents of the file.
842
866
        """
843
 
        old_path = self.old_tree.id2path(file_id)
844
 
        new_path = self.new_tree.id2path(file_id)
845
 
        new_abs_path = self._prepare_files(file_id, old_path, new_path,
846
 
                                           allow_write_new=True,
847
 
                                           force_temp=True)[1]
848
 
        command = self._get_command(osutils.pathjoin('old', old_path),
849
 
                                    osutils.pathjoin('new', new_path))
 
867
        old_abs_path, new_abs_path = self._prepare_files(
 
868
                old_path, new_path, allow_write_new=True, force_temp=True,
 
869
                file_id=file_id)
 
870
        command = self._get_command(old_abs_path, new_abs_path)
850
871
        subprocess.call(command, cwd=self._root)
851
 
        new_file = open(new_abs_path, 'r')
852
 
        try:
 
872
        with open(new_abs_path, 'rb') as new_file:
853
873
            return new_file.read()
854
 
        finally:
855
 
            new_file.close()
856
874
 
857
875
 
858
876
class DiffTree(object):
900
918
    @classmethod
901
919
    def from_trees_options(klass, old_tree, new_tree, to_file,
902
920
                           path_encoding, external_diff_options, old_label,
903
 
                           new_label, using):
 
921
                           new_label, using, context_lines):
904
922
        """Factory for producing a DiffTree.
905
923
 
906
924
        Designed to accept options used by show_diff_trees.
 
925
 
907
926
        :param old_tree: The tree to show as old in the comparison
908
927
        :param new_tree: The tree to show as new in the comparison
909
928
        :param to_file: File to write comparisons to
915
934
        :param using: Commandline to use to invoke an external diff tool
916
935
        """
917
936
        if using is not None:
918
 
            extra_factories = [DiffFromTool.make_from_diff_tree(using)]
 
937
            extra_factories = [DiffFromTool.make_from_diff_tree(using, external_diff_options)]
919
938
        else:
920
939
            extra_factories = []
921
940
        if external_diff_options:
922
941
            opts = external_diff_options.split()
923
 
            def diff_file(olab, olines, nlab, nlines, to_file):
 
942
            def diff_file(olab, olines, nlab, nlines, to_file, path_encoding=None, context_lines=None):
 
943
                """:param path_encoding: not used but required
 
944
                        to match the signature of internal_diff.
 
945
                """
924
946
                external_diff(olab, olines, nlab, nlines, to_file, opts)
925
947
        else:
926
948
            diff_file = internal_diff
927
949
        diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
928
 
                             old_label, new_label, diff_file)
 
950
                             old_label, new_label, diff_file, context_lines=context_lines)
929
951
        return klass(old_tree, new_tree, to_file, path_encoding, diff_text,
930
952
                     extra_factories)
931
953
 
975
997
            properties_changed.extend(get_executable_change(executable[0], executable[1]))
976
998
 
977
999
            if properties_changed:
978
 
                prop_str = " (properties changed: %s)" % (", ".join(properties_changed),)
 
1000
                prop_str = b" (properties changed: %s)" % (
 
1001
                        b", ".join(properties_changed),)
979
1002
            else:
980
 
                prop_str = ""
 
1003
                prop_str = b""
981
1004
 
982
1005
            if (old_present, new_present) == (True, False):
983
 
                self.to_file.write("=== removed %s '%s'\n" %
984
 
                                   (kind[0], oldpath_encoded))
 
1006
                self.to_file.write(b"=== removed %s '%s'\n" %
 
1007
                                   (kind[0].encode('ascii'), oldpath_encoded))
985
1008
                newpath = oldpath
986
1009
            elif (old_present, new_present) == (False, True):
987
 
                self.to_file.write("=== added %s '%s'\n" %
988
 
                                   (kind[1], newpath_encoded))
 
1010
                self.to_file.write(b"=== added %s '%s'\n" %
 
1011
                                   (kind[1].encode('ascii'), newpath_encoded))
989
1012
                oldpath = newpath
990
1013
            elif renamed:
991
 
                self.to_file.write("=== renamed %s '%s' => '%s'%s\n" %
992
 
                    (kind[0], oldpath_encoded, newpath_encoded, prop_str))
 
1014
                self.to_file.write(b"=== renamed %s '%s' => '%s'%s\n" %
 
1015
                    (kind[0].encode('ascii'), oldpath_encoded, newpath_encoded, prop_str))
993
1016
            else:
994
1017
                # if it was produced by iter_changes, it must be
995
1018
                # modified *somehow*, either content or execute bit.
996
 
                self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
 
1019
                self.to_file.write(b"=== modified %s '%s'%s\n" % (kind[0].encode('ascii'),
997
1020
                                   newpath_encoded, prop_str))
998
1021
            if changed_content:
999
 
                self._diff(file_id, oldpath, newpath, kind[0], kind[1])
 
1022
                self._diff(oldpath, newpath, kind[0], kind[1], file_id=file_id)
1000
1023
                has_changes = 1
1001
1024
            if renamed:
1002
1025
                has_changes = 1
1009
1032
        :param old_path: The path of the file in the old tree
1010
1033
        :param new_path: The path of the file in the new tree
1011
1034
        """
1012
 
        try:
1013
 
            old_kind = self.old_tree.kind(file_id)
1014
 
        except (errors.NoSuchId, errors.NoSuchFile):
 
1035
        if old_path is None:
1015
1036
            old_kind = None
1016
 
        try:
1017
 
            new_kind = self.new_tree.kind(file_id)
1018
 
        except (errors.NoSuchId, errors.NoSuchFile):
 
1037
        else:
 
1038
            old_kind = self.old_tree.kind(old_path, file_id)
 
1039
        if new_path is None:
1019
1040
            new_kind = None
1020
 
        self._diff(file_id, old_path, new_path, old_kind, new_kind)
1021
 
 
1022
 
 
1023
 
    def _diff(self, file_id, old_path, new_path, old_kind, new_kind):
 
1041
        else:
 
1042
            new_kind = self.new_tree.kind(new_path, file_id)
 
1043
        self._diff(old_path, new_path, old_kind, new_kind, file_id=file_id)
 
1044
 
 
1045
    def _diff(self, old_path, new_path, old_kind, new_kind, file_id):
1024
1046
        result = DiffPath._diff_many(self.differs, file_id, old_path,
1025
 
                                       new_path, old_kind, new_kind)
 
1047
                                     new_path, old_kind, new_kind)
1026
1048
        if result is DiffPath.CANNOT_DIFF:
1027
1049
            error_path = new_path
1028
1050
            if error_path is None: