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

  • Committer: Andrew Bennetts
  • Date: 2008-01-04 03:12:11 UTC
  • mfrom: (3164 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3320.
  • Revision ID: andrew.bennetts@canonical.com-20080104031211-wy4uxo2j4elvip1j
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd.
 
1
# Copyright (C) 2004, 2005, 2006 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import difflib
18
18
import os
19
19
import re
20
 
import string
 
20
import shutil
21
21
import sys
22
22
 
23
23
from bzrlib.lazy_import import lazy_import
28
28
import time
29
29
 
30
30
from bzrlib import (
31
 
    branch as _mod_branch,
32
31
    bzrdir,
33
 
    cmdline,
34
 
    cleanup,
 
32
    commands,
35
33
    errors,
36
34
    osutils,
37
35
    patiencediff,
38
36
    textfile,
39
37
    timestamp,
40
 
    views,
41
38
    )
42
 
 
43
 
from bzrlib.workingtree import WorkingTree
44
39
""")
45
40
 
46
 
from bzrlib.registry import (
47
 
    Registry,
48
 
    )
49
41
from bzrlib.symbol_versioning import (
50
 
    deprecated_function,
51
 
    deprecated_in,
52
 
    )
53
 
from bzrlib.trace import mutter, note, warning
54
 
 
55
 
 
56
 
class AtTemplate(string.Template):
57
 
    """Templating class that uses @ instead of $."""
58
 
 
59
 
    delimiter = '@'
 
42
        deprecated_function,
 
43
        one_zero,
 
44
        )
 
45
from bzrlib.trace import mutter, warning
60
46
 
61
47
 
62
48
# TODO: Rather than building a changeset object, we should probably
91
77
    # both sequences are empty.
92
78
    if not oldlines and not newlines:
93
79
        return
94
 
 
 
80
    
95
81
    if allow_binary is False:
96
82
        textfile.check_text_lines(oldlines)
97
83
        textfile.check_text_lines(newlines)
112
98
        ud[2] = ud[2].replace('-1,0', '-0,0')
113
99
    elif not newlines:
114
100
        ud[2] = ud[2].replace('+1,0', '+0,0')
 
101
    # work around for difflib emitting random spaces after the label
 
102
    ud[0] = ud[0][:-2] + '\n'
 
103
    ud[1] = ud[1][:-2] + '\n'
115
104
 
116
105
    for line in ud:
117
106
        to_file.write(line)
184
173
 
185
174
        if not diff_opts:
186
175
            diff_opts = []
187
 
        if sys.platform == 'win32':
188
 
            # Popen doesn't do the proper encoding for external commands
189
 
            # 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')
192
176
        diffcmd = ['diff',
193
177
                   '--label', old_filename,
194
178
                   old_abspath,
217
201
            break
218
202
        else:
219
203
            diffcmd.append('-u')
220
 
 
 
204
                  
221
205
        if diff_opts:
222
206
            diffcmd.extend(diff_opts)
223
207
 
224
208
        pipe = _spawn_external_diff(diffcmd, capture_errors=True)
225
209
        out,err = pipe.communicate()
226
210
        rc = pipe.returncode
227
 
 
 
211
        
228
212
        # internal_diff() adds a trailing newline, add one here for consistency
229
213
        out += '\n'
230
214
        if rc == 2:
265
249
                msg = 'signal %d' % (-rc)
266
250
            else:
267
251
                msg = 'exit code %d' % rc
268
 
 
269
 
            raise errors.BzrError('external diff failed with %s; command: %r'
 
252
                
 
253
            raise errors.BzrError('external diff failed with %s; command: %r' 
270
254
                                  % (rc, diffcmd))
271
255
 
272
256
 
290
274
                        new_abspath, e)
291
275
 
292
276
 
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)
 
277
@deprecated_function(one_zero)
 
278
def diff_cmd_helper(tree, specific_files, external_diff_options, 
 
279
                    old_revision_spec=None, new_revision_spec=None,
 
280
                    revision_specs=None,
 
281
                    old_label='a/', new_label='b/'):
 
282
    """Helper for cmd_diff.
 
283
 
 
284
    :param tree:
 
285
        A WorkingTree
 
286
 
 
287
    :param specific_files:
 
288
        The specific files to compare, or None
 
289
 
 
290
    :param external_diff_options:
 
291
        If non-None, run an external diff, and pass it these options
 
292
 
 
293
    :param old_revision_spec:
 
294
        If None, use basis tree as old revision, otherwise use the tree for
 
295
        the specified revision. 
 
296
 
 
297
    :param new_revision_spec:
 
298
        If None, use working tree as new revision, otherwise use the tree for
 
299
        the specified revision.
324
300
    
325
 
 
326
 
def get_trees_and_branches_to_diff_locked(
327
 
    path_list, revision_specs, old_url, new_url, add_cleanup, apply_view=True):
 
301
    :param revision_specs: 
 
302
        Zero, one or two RevisionSpecs from the command line, saying what revisions 
 
303
        to compare.  This can be passed as an alternative to the old_revision_spec 
 
304
        and new_revision_spec parameters.
 
305
 
 
306
    The more general form is show_diff_trees(), where the caller
 
307
    supplies any two trees.
 
308
    """
 
309
 
 
310
    # TODO: perhaps remove the old parameters old_revision_spec and
 
311
    # new_revision_spec, since this is only really for use from cmd_diff and
 
312
    # it now always passes through a sequence of revision_specs -- mbp
 
313
    # 20061221
 
314
 
 
315
    def spec_tree(spec):
 
316
        if tree:
 
317
            revision = spec.in_store(tree.branch)
 
318
        else:
 
319
            revision = spec.in_store(None)
 
320
        revision_id = revision.rev_id
 
321
        branch = revision.branch
 
322
        return branch.repository.revision_tree(revision_id)
 
323
 
 
324
    if revision_specs is not None:
 
325
        assert (old_revision_spec is None
 
326
                and new_revision_spec is None)
 
327
        if len(revision_specs) > 0:
 
328
            old_revision_spec = revision_specs[0]
 
329
        if len(revision_specs) > 1:
 
330
            new_revision_spec = revision_specs[1]
 
331
 
 
332
    if old_revision_spec is None:
 
333
        old_tree = tree.basis_tree()
 
334
    else:
 
335
        old_tree = spec_tree(old_revision_spec)
 
336
 
 
337
    if (new_revision_spec is None
 
338
        or new_revision_spec.spec is None):
 
339
        new_tree = tree
 
340
    else:
 
341
        new_tree = spec_tree(new_revision_spec)
 
342
 
 
343
    if new_tree is not tree:
 
344
        extra_trees = (tree,)
 
345
    else:
 
346
        extra_trees = None
 
347
 
 
348
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
 
349
                           external_diff_options,
 
350
                           old_label=old_label, new_label=new_label,
 
351
                           extra_trees=extra_trees)
 
352
 
 
353
 
 
354
def _get_trees_to_diff(path_list, revision_specs, old_url, new_url):
328
355
    """Get the trees and specific files to diff given a list of paths.
329
356
 
330
357
    This method works out the trees to be diff'ed and the files of
341
368
    :param new_url:
342
369
        The url of the new branch or tree. If None, the tree to use is
343
370
        taken from the first path, if any, or the current working tree.
344
 
    :param add_cleanup:
345
 
        a callable like Command.add_cleanup.  get_trees_and_branches_to_diff
346
 
        will register cleanups that must be run to unlock the trees, etc.
347
 
    :param apply_view:
348
 
        if True and a view is set, apply the view or check that the paths
349
 
        are within it
350
371
    :returns:
351
 
        a tuple of (old_tree, new_tree, old_branch, new_branch,
352
 
        specific_files, extra_trees) where extra_trees is a sequence of
353
 
        additional trees to search in for file-ids.  The trees and branches
354
 
        will be read-locked until the cleanups registered via the add_cleanup
355
 
        param are run.
 
372
        a tuple of (old_tree, new_tree, specific_files, extra_trees) where
 
373
        extra_trees is a sequence of additional trees to search in for
 
374
        file-ids.
356
375
    """
357
376
    # Get the old and new revision specs
358
377
    old_revision_spec = None
369
388
 
370
389
    other_paths = []
371
390
    make_paths_wt_relative = True
372
 
    consider_relpath = True
373
391
    if path_list is None or len(path_list) == 0:
374
 
        # If no path is given, the current working tree is used
 
392
        # If no path is given, assume the current directory
375
393
        default_location = u'.'
376
 
        consider_relpath = False
377
394
    elif old_url is not None and new_url is not None:
378
395
        other_paths = path_list
379
396
        make_paths_wt_relative = False
381
398
        default_location = path_list[0]
382
399
        other_paths = path_list[1:]
383
400
 
384
 
    def lock_tree_or_branch(wt, br):
385
 
        if wt is not None:
386
 
            wt.lock_read()
387
 
            add_cleanup(wt.unlock)
388
 
        elif br is not None:
389
 
            br.lock_read()
390
 
            add_cleanup(br.unlock)
391
 
 
392
401
    # Get the old location
393
402
    specific_files = []
394
403
    if old_url is None:
395
404
        old_url = default_location
396
405
    working_tree, branch, relpath = \
397
406
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
398
 
    lock_tree_or_branch(working_tree, branch)
399
 
    if consider_relpath and relpath != '':
400
 
        if working_tree is not None and apply_view:
401
 
            views.check_path_in_view(working_tree, relpath)
 
407
    if relpath != '':
402
408
        specific_files.append(relpath)
403
409
    old_tree = _get_tree_to_diff(old_revision_spec, working_tree, branch)
404
 
    old_branch = branch
405
410
 
406
411
    # Get the new location
407
412
    if new_url is None:
409
414
    if new_url != old_url:
410
415
        working_tree, branch, relpath = \
411
416
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
412
 
        lock_tree_or_branch(working_tree, branch)
413
 
        if consider_relpath and relpath != '':
414
 
            if working_tree is not None and apply_view:
415
 
                views.check_path_in_view(working_tree, relpath)
 
417
        if relpath != '':
416
418
            specific_files.append(relpath)
417
419
    new_tree = _get_tree_to_diff(new_revision_spec, working_tree, branch,
418
420
        basis_is_default=working_tree is None)
419
 
    new_branch = branch
420
421
 
421
422
    # Get the specific files (all files is None, no files is [])
422
423
    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,
426
 
            apply_view=apply_view)
427
 
        except errors.FileInWrongBranch:
428
 
            raise errors.BzrCommandError("Files are in different branches")
 
424
        other_paths = _relative_paths_in_tree(working_tree, other_paths)
429
425
    specific_files.extend(other_paths)
430
426
    if len(specific_files) == 0:
431
427
        specific_files = None
432
 
        if (working_tree is not None and working_tree.supports_views()
433
 
            and apply_view):
434
 
            view_files = working_tree.views.lookup_view()
435
 
            if view_files:
436
 
                specific_files = view_files
437
 
                view_str = views.view_display_str(view_files)
438
 
                note("*** Ignoring files outside view. View is %s" % view_str)
439
428
 
440
429
    # Get extra trees that ought to be searched for file-ids
441
430
    extra_trees = None
442
431
    if working_tree is not None and working_tree not in (old_tree, new_tree):
443
432
        extra_trees = (working_tree,)
444
 
    return old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees
 
433
    return old_tree, new_tree, specific_files, extra_trees
445
434
 
446
435
 
447
436
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
455
444
                return branch.basis_tree()
456
445
        else:
457
446
            return tree
458
 
    return spec.as_tree(branch)
 
447
    revision = spec.in_store(branch)
 
448
    revision_id = revision.rev_id
 
449
    rev_branch = revision.branch
 
450
    return rev_branch.repository.revision_tree(revision_id)
 
451
 
 
452
 
 
453
def _relative_paths_in_tree(tree, paths):
 
454
    """Get the relative paths within a working tree.
 
455
 
 
456
    Each path may be either an absolute path or a path relative to the
 
457
    current working directory.
 
458
    """
 
459
    result = []
 
460
    for filename in paths:
 
461
        try:
 
462
            result.append(tree.relpath(osutils.dereference_path(filename)))
 
463
        except errors.PathNotChild:
 
464
            raise errors.BzrCommandError("Files are in different branches")
 
465
    return result
459
466
 
460
467
 
461
468
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
463
470
                    old_label='a/', new_label='b/',
464
471
                    extra_trees=None,
465
472
                    path_encoding='utf8',
466
 
                    using=None,
467
 
                    format_cls=None):
 
473
                    using=None):
468
474
    """Show in text form the changes from one tree to another.
469
475
 
470
 
    :param to_file: The output stream.
471
 
    :param specific_files:Include only changes to these files - None for all
472
 
        changes.
473
 
    :param external_diff_options: If set, use an external GNU diff and pass 
474
 
        these options.
475
 
    :param extra_trees: If set, more Trees to use for looking up file ids
476
 
    :param path_encoding: If set, the path will be encoded as specified, 
477
 
        otherwise is supposed to be utf8
478
 
    :param format_cls: Formatter class (DiffTree subclass)
 
476
    to_file
 
477
        The output stream.
 
478
 
 
479
    specific_files
 
480
        Include only changes to these files - None for all changes.
 
481
 
 
482
    external_diff_options
 
483
        If set, use an external GNU diff and pass these options.
 
484
 
 
485
    extra_trees
 
486
        If set, more Trees to use for looking up file ids
 
487
 
 
488
    path_encoding
 
489
        If set, the path will be encoded as specified, otherwise is supposed
 
490
        to be utf8
479
491
    """
480
 
    if format_cls is None:
481
 
        format_cls = DiffTree
482
492
    old_tree.lock_read()
483
493
    try:
484
494
        if extra_trees is not None:
486
496
                tree.lock_read()
487
497
        new_tree.lock_read()
488
498
        try:
489
 
            differ = format_cls.from_trees_options(old_tree, new_tree, to_file,
490
 
                                                   path_encoding,
491
 
                                                   external_diff_options,
492
 
                                                   old_label, new_label, using)
 
499
            differ = DiffTree.from_trees_options(old_tree, new_tree, to_file,
 
500
                                                 path_encoding,
 
501
                                                 external_diff_options,
 
502
                                                 old_label, new_label, using)
493
503
            return differ.show_diff(specific_files, extra_trees)
494
504
        finally:
495
505
            new_tree.unlock()
502
512
 
503
513
def _patch_header_date(tree, file_id, path):
504
514
    """Returns a timestamp suitable for use in a patch header."""
505
 
    try:
506
 
        mtime = tree.get_file_mtime(file_id, path)
507
 
    except errors.FileTimestampUnavailable:
508
 
        mtime = 0
 
515
    mtime = tree.get_file_mtime(file_id, path)
 
516
    assert mtime is not None, \
 
517
        "got an mtime of None for file-id %s, path %s in tree %s" % (
 
518
                file_id, path, tree)
509
519
    return timestamp.format_patch_date(mtime)
510
520
 
511
521
 
512
 
def get_executable_change(old_is_x, new_is_x):
513
 
    descr = { True:"+x", False:"-x", None:"??" }
514
 
    if old_is_x != new_is_x:
515
 
        return ["%s to %s" % (descr[old_is_x], descr[new_is_x],)]
 
522
def _raise_if_nonexistent(paths, old_tree, new_tree):
 
523
    """Complain if paths are not in either inventory or tree.
 
524
 
 
525
    It's OK with the files exist in either tree's inventory, or 
 
526
    if they exist in the tree but are not versioned.
 
527
    
 
528
    This can be used by operations such as bzr status that can accept
 
529
    unknown or ignored files.
 
530
    """
 
531
    mutter("check paths: %r", paths)
 
532
    if not paths:
 
533
        return
 
534
    s = old_tree.filter_unversioned_files(paths)
 
535
    s = new_tree.filter_unversioned_files(s)
 
536
    s = [path for path in s if not new_tree.has_filename(path)]
 
537
    if s:
 
538
        raise errors.PathsDoNotExist(sorted(s))
 
539
 
 
540
 
 
541
def get_prop_change(meta_modified):
 
542
    if meta_modified:
 
543
        return " (properties changed)"
516
544
    else:
517
 
        return []
 
545
        return  ""
518
546
 
519
547
 
520
548
class DiffPath(object):
689
717
            return self.CANNOT_DIFF
690
718
        from_label = '%s%s\t%s' % (self.old_label, old_path, old_date)
691
719
        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)
 
720
        return self.diff_text(from_file_id, to_file_id, from_label, to_label)
694
721
 
695
 
    def diff_text(self, from_file_id, to_file_id, from_label, to_label,
696
 
        from_path=None, to_path=None):
 
722
    def diff_text(self, from_file_id, to_file_id, from_label, to_label):
697
723
        """Diff the content of given files in two trees
698
724
 
699
725
        :param from_file_id: The id of the file in the from tree.  If None,
701
727
        :param to_file_id: The id of the file in the to tree.  This may refer
702
728
            to a different file from from_file_id.  If None,
703
729
            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.
706
730
        """
707
 
        def _get_text(tree, file_id, path):
 
731
        def _get_text(tree, file_id):
708
732
            if file_id is not None:
709
 
                return tree.get_file(file_id, path).readlines()
 
733
                return tree.get_file(file_id).readlines()
710
734
            else:
711
735
                return []
712
736
        try:
713
 
            from_text = _get_text(self.old_tree, from_file_id, from_path)
714
 
            to_text = _get_text(self.new_tree, to_file_id, to_path)
 
737
            from_text = _get_text(self.old_tree, from_file_id)
 
738
            to_text = _get_text(self.new_tree, to_file_id)
715
739
            self.text_differ(from_label, from_text, to_label, to_text,
716
740
                             self.to_file)
717
741
        except errors.BinaryFile:
727
751
                 path_encoding='utf-8'):
728
752
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
729
753
        self.command_template = command_template
730
 
        self._root = osutils.mkdtemp(prefix='bzr-diff-')
 
754
        self._root = tempfile.mkdtemp(prefix='bzr-diff-')
731
755
 
732
756
    @classmethod
733
757
    def from_string(klass, command_string, old_tree, new_tree, to_file,
734
758
                    path_encoding='utf-8'):
735
 
        command_template = cmdline.split(command_string)
736
 
        if '@' not in command_string:
737
 
            command_template.extend(['@old_path', '@new_path'])
 
759
        command_template = commands.shlex_split_unicode(command_string)
 
760
        command_template.extend(['%(old_path)s', '%(new_path)s'])
738
761
        return klass(command_template, old_tree, new_tree, to_file,
739
762
                     path_encoding)
740
763
 
747
770
 
748
771
    def _get_command(self, old_path, new_path):
749
772
        my_map = {'old_path': old_path, 'new_path': new_path}
750
 
        return [AtTemplate(t).substitute(my_map) for t in
751
 
                self.command_template]
 
773
        return [t % my_map for t in self.command_template]
752
774
 
753
775
    def _execute(self, old_path, new_path):
754
776
        command = self._get_command(old_path, new_path)
764
786
        return proc.wait()
765
787
 
766
788
    def _try_symlink_root(self, tree, prefix):
767
 
        if (getattr(tree, 'abspath', None) is None
768
 
            or not osutils.host_os_dereferences_symlinks()):
 
789
        if not (getattr(tree, 'abspath', None) is not None
 
790
                and osutils.has_symlinks()):
769
791
            return False
770
792
        try:
771
793
            os.symlink(tree.abspath(''), osutils.pathjoin(self._root, prefix))
774
796
                raise
775
797
        return True
776
798
 
777
 
    def _write_file(self, file_id, tree, prefix, relpath, force_temp=False,
778
 
                    allow_write=False):
779
 
        if not force_temp and isinstance(tree, WorkingTree):
780
 
            return tree.abspath(tree.id2path(file_id))
781
 
        
 
799
    def _write_file(self, file_id, tree, prefix, relpath):
782
800
        full_path = osutils.pathjoin(self._root, prefix, relpath)
783
 
        if not force_temp and self._try_symlink_root(tree, prefix):
 
801
        if self._try_symlink_root(tree, prefix):
784
802
            return full_path
785
803
        parent_dir = osutils.dirname(full_path)
786
804
        try:
797
815
                target.close()
798
816
        finally:
799
817
            source.close()
800
 
        try:
801
 
            mtime = tree.get_file_mtime(file_id)
802
 
        except errors.FileTimestampUnavailable:
803
 
            pass
804
 
        else:
805
 
            os.utime(full_path, (mtime, mtime))
806
 
        if not allow_write:
807
 
            osutils.make_readonly(full_path)
 
818
        osutils.make_readonly(full_path)
 
819
        mtime = tree.get_file_mtime(file_id)
 
820
        os.utime(full_path, (mtime, mtime))
808
821
        return full_path
809
822
 
810
 
    def _prepare_files(self, file_id, old_path, new_path, force_temp=False,
811
 
                       allow_write_new=False):
 
823
    def _prepare_files(self, file_id, old_path, new_path):
812
824
        old_disk_path = self._write_file(file_id, self.old_tree, 'old',
813
 
                                         old_path, force_temp)
 
825
                                         old_path)
814
826
        new_disk_path = self._write_file(file_id, self.new_tree, 'new',
815
 
                                         new_path, force_temp,
816
 
                                         allow_write=allow_write_new)
 
827
                                         new_path)
817
828
        return old_disk_path, new_disk_path
818
829
 
819
830
    def finish(self):
820
 
        try:
821
 
            osutils.rmtree(self._root)
822
 
        except OSError, e:
823
 
            if e.errno != errno.ENOENT:
824
 
                mutter("The temporary directory \"%s\" was not "
825
 
                        "cleanly removed: %s." % (self._root, e))
 
831
        osutils.rmtree(self._root)
826
832
 
827
833
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
828
834
        if (old_kind, new_kind) != ('file', 'file'):
829
835
            return DiffPath.CANNOT_DIFF
830
 
        (old_disk_path, new_disk_path) = self._prepare_files(
831
 
                                                file_id, old_path, new_path)
832
 
        self._execute(old_disk_path, new_disk_path)
833
 
 
834
 
    def edit_file(self, file_id):
835
 
        """Use this tool to edit a file.
836
 
 
837
 
        A temporary copy will be edited, and the new contents will be
838
 
        returned.
839
 
 
840
 
        :param file_id: The id of the file to edit.
841
 
        :return: The new contents of the file.
842
 
        """
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))
850
 
        subprocess.call(command, cwd=self._root)
851
 
        new_file = open(new_abs_path, 'r')
852
 
        try:
853
 
            return new_file.read()
854
 
        finally:
855
 
            new_file.close()
 
836
        self._prepare_files(file_id, old_path, new_path)
 
837
        self._execute(osutils.pathjoin('old', old_path),
 
838
                      osutils.pathjoin('new', new_path))
856
839
 
857
840
 
858
841
class DiffTree(object):
919
902
        else:
920
903
            extra_factories = []
921
904
        if external_diff_options:
 
905
            assert isinstance(external_diff_options, basestring)
922
906
            opts = external_diff_options.split()
923
907
            def diff_file(olab, olines, nlab, nlines, to_file):
924
908
                external_diff(olab, olines, nlab, nlines, to_file, opts)
932
916
    def show_diff(self, specific_files, extra_trees=None):
933
917
        """Write tree diff to self.to_file
934
918
 
935
 
        :param specific_files: the specific files to compare (recursive)
 
919
        :param sepecific_files: the specific files to compare (recursive)
936
920
        :param extra_trees: extra trees to use for mapping paths to file_ids
937
921
        """
938
922
        try:
944
928
    def _show_diff(self, specific_files, extra_trees):
945
929
        # TODO: Generation of pseudo-diffs for added/deleted files could
946
930
        # be usefully made into a much faster special case.
947
 
        iterator = self.new_tree.iter_changes(self.old_tree,
 
931
        iterator = self.new_tree._iter_changes(self.old_tree,
948
932
                                               specific_files=specific_files,
949
933
                                               extra_trees=extra_trees,
950
934
                                               require_versioned=True)
960
944
                return path.encode(self.path_encoding, "replace")
961
945
        for (file_id, paths, changed_content, versioned, parent, name, kind,
962
946
             executable) in sorted(iterator, key=changes_key):
963
 
            # The root does not get diffed, and items with no known kind (that
964
 
            # is, missing) in both trees are skipped as well.
965
 
            if parent == (None, None) or kind == (None, None):
 
947
            if parent == (None, None):
966
948
                continue
967
949
            oldpath, newpath = paths
968
950
            oldpath_encoded = get_encoded_path(paths[0])
970
952
            old_present = (kind[0] is not None and versioned[0])
971
953
            new_present = (kind[1] is not None and versioned[1])
972
954
            renamed = (parent[0], name[0]) != (parent[1], name[1])
973
 
 
974
 
            properties_changed = []
975
 
            properties_changed.extend(get_executable_change(executable[0], executable[1]))
976
 
 
977
 
            if properties_changed:
978
 
                prop_str = " (properties changed: %s)" % (", ".join(properties_changed),)
979
 
            else:
980
 
                prop_str = ""
981
 
 
 
955
            prop_str = get_prop_change(executable[0] != executable[1])
982
956
            if (old_present, new_present) == (True, False):
983
957
                self.to_file.write("=== removed %s '%s'\n" %
984
958
                                   (kind[0], oldpath_encoded))
991
965
                self.to_file.write("=== renamed %s '%s' => '%s'%s\n" %
992
966
                    (kind[0], oldpath_encoded, newpath_encoded, prop_str))
993
967
            else:
994
 
                # if it was produced by iter_changes, it must be
 
968
                # if it was produced by _iter_changes, it must be
995
969
                # modified *somehow*, either content or execute bit.
996
970
                self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
997
971
                                   newpath_encoded, prop_str))
998
972
            if changed_content:
999
 
                self._diff(file_id, oldpath, newpath, kind[0], kind[1])
 
973
                self.diff(file_id, oldpath, newpath)
1000
974
                has_changes = 1
1001
975
            if renamed:
1002
976
                has_changes = 1
1017
991
            new_kind = self.new_tree.kind(file_id)
1018
992
        except (errors.NoSuchId, errors.NoSuchFile):
1019
993
            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):
 
994
 
1024
995
        result = DiffPath._diff_many(self.differs, file_id, old_path,
1025
996
                                       new_path, old_kind, new_kind)
1026
997
        if result is DiffPath.CANNOT_DIFF:
1028
999
            if error_path is None:
1029
1000
                error_path = old_path
1030
1001
            raise errors.NoDiffFound(error_path)
1031
 
 
1032
 
 
1033
 
format_registry = Registry()
1034
 
format_registry.register('default', DiffTree)