← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
1
 
# Copyright (C) 2005-2011 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
27
29
import tempfile
28
30
 
29
31
from bzrlib import (
30
 
    bzrdir,
 
32
    cleanup,
31
33
    cmdline,
32
 
    cleanup,
 
34
    controldir,
33
35
    errors,
34
36
    osutils,
35
37
    patiencediff,
39
41
    )
40
42
 
41
43
from bzrlib.workingtree import WorkingTree
 
44
from bzrlib.i18n import gettext
42
45
""")
43
46
 
44
47
from bzrlib.registry import (
46
49
    )
47
50
from bzrlib.trace import mutter, note, warning
48
51
 
 
52
DEFAULT_CONTEXT_AMOUNT = 3
49
53
 
50
54
class AtTemplate(string.Template):
51
55
    """Templating class that uses @ instead of $."""
69
73
 
70
74
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
71
75
                  allow_binary=False, sequence_matcher=None,
72
 
                  path_encoding='utf8'):
 
76
                  path_encoding='utf8', context_lines=DEFAULT_CONTEXT_AMOUNT):
73
77
    # FIXME: difflib is wrong if there is no trailing newline.
74
78
    # The syntax used by patch seems to be "\ No newline at
75
79
    # end of file" following the last diff line from that
95
99
    ud = patiencediff.unified_diff(oldlines, newlines,
96
100
                      fromfile=old_filename.encode(path_encoding, 'replace'),
97
101
                      tofile=new_filename.encode(path_encoding, 'replace'),
98
 
                      sequencematcher=sequence_matcher)
 
102
                      n=context_lines, sequencematcher=sequence_matcher)
99
103
 
100
104
    ud = list(ud)
101
105
    if len(ud) == 0: # Identical contents, nothing to do
115
119
 
116
120
 
117
121
def _spawn_external_diff(diffcmd, capture_errors=True):
118
 
    """Spawn the externall diff process, and return the child handle.
 
122
    """Spawn the external diff process, and return the child handle.
119
123
 
120
124
    :param diffcmd: The command list to spawn
121
125
    :param capture_errors: Capture stderr as well as setting LANG=C
150
154
 
151
155
    return pipe
152
156
 
 
157
# diff style options as of GNU diff v3.2
 
158
style_option_list = ['-c', '-C', '--context',
 
159
                     '-e', '--ed',
 
160
                     '-f', '--forward-ed',
 
161
                     '-q', '--brief',
 
162
                     '--normal',
 
163
                     '-n', '--rcs',
 
164
                     '-u', '-U', '--unified',
 
165
                     '-y', '--side-by-side',
 
166
                     '-D', '--ifdef']
 
167
 
 
168
def default_style_unified(diff_opts):
 
169
    """Default to unified diff style if alternative not specified in diff_opts.
 
170
 
 
171
        diff only allows one style to be specified; they don't override.
 
172
        Note that some of these take optargs, and the optargs can be
 
173
        directly appended to the options.
 
174
        This is only an approximate parser; it doesn't properly understand
 
175
        the grammar.
 
176
 
 
177
    :param diff_opts: List of options for external (GNU) diff.
 
178
    :return: List of options with default style=='unified'.
 
179
    """
 
180
    for s in style_option_list:
 
181
        for j in diff_opts:
 
182
            if j.startswith(s):
 
183
                break
 
184
        else:
 
185
            continue
 
186
        break
 
187
    else:
 
188
        diff_opts.append('-u')
 
189
    return diff_opts
 
190
 
153
191
 
154
192
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
155
193
                  diff_opts):
191
229
                   '--binary',
192
230
                  ]
193
231
 
194
 
        # diff only allows one style to be specified; they don't override.
195
 
        # note that some of these take optargs, and the optargs can be
196
 
        # directly appended to the options.
197
 
        # this is only an approximate parser; it doesn't properly understand
198
 
        # the grammar.
199
 
        for s in ['-c', '-u', '-C', '-U',
200
 
                  '-e', '--ed',
201
 
                  '-q', '--brief',
202
 
                  '--normal',
203
 
                  '-n', '--rcs',
204
 
                  '-y', '--side-by-side',
205
 
                  '-D', '--ifdef']:
206
 
            for j in diff_opts:
207
 
                if j.startswith(s):
208
 
                    break
209
 
            else:
210
 
                continue
211
 
            break
212
 
        else:
213
 
            diffcmd.append('-u')
 
232
        diff_opts = default_style_unified(diff_opts)
214
233
 
215
234
        if diff_opts:
216
235
            diffcmd.extend(diff_opts)
261
280
                msg = 'exit code %d' % rc
262
281
 
263
282
            raise errors.BzrError('external diff failed with %s; command: %r'
264
 
                                  % (rc, diffcmd))
 
283
                                  % (msg, diffcmd))
265
284
 
266
285
 
267
286
    finally:
268
287
        oldtmpf.close()                 # and delete
269
288
        newtmpf.close()
270
 
        # Clean up. Warn in case the files couldn't be deleted
271
 
        # (in case windows still holds the file open, but not
272
 
        # if the files have already been deleted)
273
 
        try:
274
 
            os.remove(old_abspath)
275
 
        except OSError, e:
276
 
            if e.errno not in (errno.ENOENT,):
277
 
                warning('Failed to delete temporary file: %s %s',
278
 
                        old_abspath, e)
279
 
        try:
280
 
            os.remove(new_abspath)
281
 
        except OSError:
282
 
            if e.errno not in (errno.ENOENT,):
283
 
                warning('Failed to delete temporary file: %s %s',
284
 
                        new_abspath, e)
 
289
 
 
290
        def cleanup(path):
 
291
            # Warn in case the file couldn't be deleted (in case windows still
 
292
            # holds the file open, but not if the files have already been
 
293
            # deleted)
 
294
            try:
 
295
                os.remove(path)
 
296
            except OSError, e:
 
297
                if e.errno not in (errno.ENOENT,):
 
298
                    warning('Failed to delete temporary file: %s %s', path, e)
 
299
 
 
300
        cleanup(old_abspath)
 
301
        cleanup(new_abspath)
285
302
 
286
303
 
287
304
def get_trees_and_branches_to_diff_locked(
355
372
    if old_url is None:
356
373
        old_url = default_location
357
374
    working_tree, branch, relpath = \
358
 
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
 
375
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
359
376
    lock_tree_or_branch(working_tree, branch)
360
377
    if consider_relpath and relpath != '':
361
378
        if working_tree is not None and apply_view:
369
386
        new_url = default_location
370
387
    if new_url != old_url:
371
388
        working_tree, branch, relpath = \
372
 
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
 
389
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
373
390
        lock_tree_or_branch(working_tree, branch)
374
391
        if consider_relpath and relpath != '':
375
392
            if working_tree is not None and apply_view:
393
410
            if view_files:
394
411
                specific_files = view_files
395
412
                view_str = views.view_display_str(view_files)
396
 
                note("*** Ignoring files outside view. View is %s" % view_str)
 
413
                note(gettext("*** Ignoring files outside view. View is %s") % view_str)
397
414
 
398
415
    # Get extra trees that ought to be searched for file-ids
399
416
    extra_trees = None
423
440
                    extra_trees=None,
424
441
                    path_encoding='utf8',
425
442
                    using=None,
426
 
                    format_cls=None):
 
443
                    format_cls=None,
 
444
                    context=DEFAULT_CONTEXT_AMOUNT):
427
445
    """Show in text form the changes from one tree to another.
428
446
 
429
447
    :param to_file: The output stream.
436
454
        otherwise is supposed to be utf8
437
455
    :param format_cls: Formatter class (DiffTree subclass)
438
456
    """
 
457
    if context is None:
 
458
        context = DEFAULT_CONTEXT_AMOUNT
439
459
    if format_cls is None:
440
460
        format_cls = DiffTree
441
461
    old_tree.lock_read()
448
468
            differ = format_cls.from_trees_options(old_tree, new_tree, to_file,
449
469
                                                   path_encoding,
450
470
                                                   external_diff_options,
451
 
                                                   old_label, new_label, using)
 
471
                                                   old_label, new_label, using,
 
472
                                                   context_lines=context)
452
473
            return differ.show_diff(specific_files, extra_trees)
453
474
        finally:
454
475
            new_tree.unlock()
612
633
    # or removed in a diff.
613
634
    EPOCH_DATE = '1970-01-01 00:00:00 +0000'
614
635
 
615
 
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
616
 
                 old_label='', new_label='', text_differ=internal_diff):
 
636
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8', 
 
637
                 old_label='', new_label='', text_differ=internal_diff, 
 
638
                 context_lines=DEFAULT_CONTEXT_AMOUNT):
617
639
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
618
640
        self.text_differ = text_differ
619
641
        self.old_label = old_label
620
642
        self.new_label = new_label
621
643
        self.path_encoding = path_encoding
 
644
        self.context_lines = context_lines
622
645
 
623
646
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
624
647
        """Compare two files in unified diff format
672
695
            from_text = _get_text(self.old_tree, from_file_id, from_path)
673
696
            to_text = _get_text(self.new_tree, to_file_id, to_path)
674
697
            self.text_differ(from_label, from_text, to_label, to_text,
675
 
                             self.to_file, path_encoding=self.path_encoding)
 
698
                             self.to_file, path_encoding=self.path_encoding,
 
699
                             context_lines=self.context_lines)
676
700
        except errors.BinaryFile:
677
701
            self.to_file.write(
678
702
                  ("Binary files %s and %s differ\n" %
902
926
    @classmethod
903
927
    def from_trees_options(klass, old_tree, new_tree, to_file,
904
928
                           path_encoding, external_diff_options, old_label,
905
 
                           new_label, using):
 
929
                           new_label, using, context_lines):
906
930
        """Factory for producing a DiffTree.
907
931
 
908
932
        Designed to accept options used by show_diff_trees.
923
947
            extra_factories = []
924
948
        if external_diff_options:
925
949
            opts = external_diff_options.split()
926
 
            def diff_file(olab, olines, nlab, nlines, to_file, path_encoding=None):
 
950
            def diff_file(olab, olines, nlab, nlines, to_file, path_encoding=None, context_lines=None):
927
951
                """:param path_encoding: not used but required
928
952
                        to match the signature of internal_diff.
929
953
                """
931
955
        else:
932
956
            diff_file = internal_diff
933
957
        diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
934
 
                             old_label, new_label, diff_file)
 
958
                             old_label, new_label, diff_file, context_lines=context_lines)
935
959
        return klass(old_tree, new_tree, to_file, path_encoding, diff_text,
936
960
                     extra_factories)
937
961