/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: 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:
1
 
# Copyright (C) 2004, 2005, 2006 Canonical Ltd.
 
1
# Copyright (C) 2005-2010 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import difflib
18
18
import os
19
19
import re
20
 
import shutil
 
20
import string
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,
31
32
    bzrdir,
32
 
    commands,
 
33
    cmdline,
 
34
    cleanup,
33
35
    errors,
34
36
    osutils,
35
37
    patiencediff,
36
38
    textfile,
37
39
    timestamp,
 
40
    views,
38
41
    )
 
42
 
 
43
from bzrlib.workingtree import WorkingTree
39
44
""")
40
45
 
 
46
from bzrlib.registry import (
 
47
    Registry,
 
48
    )
41
49
from bzrlib.symbol_versioning import (
42
 
        deprecated_function,
43
 
        one_zero,
44
 
        one_three
45
 
        )
46
 
from bzrlib.trace import mutter, warning
 
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 = '@'
47
60
 
48
61
 
49
62
# TODO: Rather than building a changeset object, we should probably
78
91
    # both sequences are empty.
79
92
    if not oldlines and not newlines:
80
93
        return
81
 
    
 
94
 
82
95
    if allow_binary is False:
83
96
        textfile.check_text_lines(oldlines)
84
97
        textfile.check_text_lines(newlines)
99
112
        ud[2] = ud[2].replace('-1,0', '-0,0')
100
113
    elif not newlines:
101
114
        ud[2] = ud[2].replace('+1,0', '+0,0')
102
 
    # work around for difflib emitting random spaces after the label
103
 
    ud[0] = ud[0][:-2] + '\n'
104
 
    ud[1] = ud[1][:-2] + '\n'
105
115
 
106
116
    for line in ud:
107
117
        to_file.write(line)
174
184
 
175
185
        if not diff_opts:
176
186
            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')
177
192
        diffcmd = ['diff',
178
193
                   '--label', old_filename,
179
194
                   old_abspath,
202
217
            break
203
218
        else:
204
219
            diffcmd.append('-u')
205
 
                  
 
220
 
206
221
        if diff_opts:
207
222
            diffcmd.extend(diff_opts)
208
223
 
209
224
        pipe = _spawn_external_diff(diffcmd, capture_errors=True)
210
225
        out,err = pipe.communicate()
211
226
        rc = pipe.returncode
212
 
        
 
227
 
213
228
        # internal_diff() adds a trailing newline, add one here for consistency
214
229
        out += '\n'
215
230
        if rc == 2:
250
265
                msg = 'signal %d' % (-rc)
251
266
            else:
252
267
                msg = 'exit code %d' % rc
253
 
                
254
 
            raise errors.BzrError('external diff failed with %s; command: %r' 
 
268
 
 
269
            raise errors.BzrError('external diff failed with %s; command: %r'
255
270
                                  % (rc, diffcmd))
256
271
 
257
272
 
275
290
                        new_abspath, e)
276
291
 
277
292
 
278
 
@deprecated_function(one_zero)
279
 
def diff_cmd_helper(tree, specific_files, external_diff_options, 
280
 
                    old_revision_spec=None, new_revision_spec=None,
281
 
                    revision_specs=None,
282
 
                    old_label='a/', new_label='b/'):
283
 
    """Helper for cmd_diff.
284
 
 
285
 
    :param tree:
286
 
        A WorkingTree
287
 
 
288
 
    :param specific_files:
289
 
        The specific files to compare, or None
290
 
 
291
 
    :param external_diff_options:
292
 
        If non-None, run an external diff, and pass it these options
293
 
 
294
 
    :param old_revision_spec:
295
 
        If None, use basis tree as old revision, otherwise use the tree for
296
 
        the specified revision. 
297
 
 
298
 
    :param new_revision_spec:
299
 
        If None, use working tree as new revision, otherwise use the tree for
300
 
        the specified revision.
 
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)
301
324
    
302
 
    :param revision_specs: 
303
 
        Zero, one or two RevisionSpecs from the command line, saying what revisions 
304
 
        to compare.  This can be passed as an alternative to the old_revision_spec 
305
 
        and new_revision_spec parameters.
306
 
 
307
 
    The more general form is show_diff_trees(), where the caller
308
 
    supplies any two trees.
309
 
    """
310
 
 
311
 
    # TODO: perhaps remove the old parameters old_revision_spec and
312
 
    # new_revision_spec, since this is only really for use from cmd_diff and
313
 
    # it now always passes through a sequence of revision_specs -- mbp
314
 
    # 20061221
315
 
 
316
 
    def spec_tree(spec):
317
 
        if tree:
318
 
            revision = spec.in_store(tree.branch)
319
 
        else:
320
 
            revision = spec.in_store(None)
321
 
        revision_id = revision.rev_id
322
 
        branch = revision.branch
323
 
        return branch.repository.revision_tree(revision_id)
324
 
 
325
 
    if revision_specs is not None:
326
 
        assert (old_revision_spec is None
327
 
                and new_revision_spec is None)
328
 
        if len(revision_specs) > 0:
329
 
            old_revision_spec = revision_specs[0]
330
 
        if len(revision_specs) > 1:
331
 
            new_revision_spec = revision_specs[1]
332
 
 
333
 
    if old_revision_spec is None:
334
 
        old_tree = tree.basis_tree()
335
 
    else:
336
 
        old_tree = spec_tree(old_revision_spec)
337
 
 
338
 
    if (new_revision_spec is None
339
 
        or new_revision_spec.spec is None):
340
 
        new_tree = tree
341
 
    else:
342
 
        new_tree = spec_tree(new_revision_spec)
343
 
 
344
 
    if new_tree is not tree:
345
 
        extra_trees = (tree,)
346
 
    else:
347
 
        extra_trees = None
348
 
 
349
 
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
350
 
                           external_diff_options,
351
 
                           old_label=old_label, new_label=new_label,
352
 
                           extra_trees=extra_trees)
353
 
 
354
 
 
355
 
def _get_trees_to_diff(path_list, revision_specs, old_url, new_url):
 
325
 
 
326
def get_trees_and_branches_to_diff_locked(
 
327
    path_list, revision_specs, old_url, new_url, add_cleanup, apply_view=True):
356
328
    """Get the trees and specific files to diff given a list of paths.
357
329
 
358
330
    This method works out the trees to be diff'ed and the files of
369
341
    :param new_url:
370
342
        The url of the new branch or tree. If None, the tree to use is
371
343
        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
372
350
    :returns:
373
 
        a tuple of (old_tree, new_tree, specific_files, extra_trees) where
374
 
        extra_trees is a sequence of additional trees to search in for
375
 
        file-ids.
 
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.
376
356
    """
377
357
    # Get the old and new revision specs
378
358
    old_revision_spec = None
401
381
        default_location = path_list[0]
402
382
        other_paths = path_list[1:]
403
383
 
 
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
 
404
392
    # Get the old location
405
393
    specific_files = []
406
394
    if old_url is None:
407
395
        old_url = default_location
408
396
    working_tree, branch, relpath = \
409
397
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
 
398
    lock_tree_or_branch(working_tree, branch)
410
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)
411
402
        specific_files.append(relpath)
412
403
    old_tree = _get_tree_to_diff(old_revision_spec, working_tree, branch)
 
404
    old_branch = branch
413
405
 
414
406
    # Get the new location
415
407
    if new_url is None:
417
409
    if new_url != old_url:
418
410
        working_tree, branch, relpath = \
419
411
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
 
412
        lock_tree_or_branch(working_tree, branch)
420
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)
421
416
            specific_files.append(relpath)
422
417
    new_tree = _get_tree_to_diff(new_revision_spec, working_tree, branch,
423
418
        basis_is_default=working_tree is None)
 
419
    new_branch = branch
424
420
 
425
421
    # Get the specific files (all files is None, no files is [])
426
422
    if make_paths_wt_relative and working_tree is not None:
427
 
        other_paths = _relative_paths_in_tree(working_tree, other_paths)
 
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")
428
429
    specific_files.extend(other_paths)
429
430
    if len(specific_files) == 0:
430
431
        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)
431
439
 
432
440
    # Get extra trees that ought to be searched for file-ids
433
441
    extra_trees = None
434
442
    if working_tree is not None and working_tree not in (old_tree, new_tree):
435
443
        extra_trees = (working_tree,)
436
 
    return old_tree, new_tree, specific_files, extra_trees
 
444
    return old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees
437
445
 
438
446
 
439
447
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
447
455
                return branch.basis_tree()
448
456
        else:
449
457
            return tree
450
 
    revision = spec.in_store(branch)
451
 
    revision_id = revision.rev_id
452
 
    rev_branch = revision.branch
453
 
    return rev_branch.repository.revision_tree(revision_id)
454
 
 
455
 
 
456
 
def _relative_paths_in_tree(tree, paths):
457
 
    """Get the relative paths within a working tree.
458
 
 
459
 
    Each path may be either an absolute path or a path relative to the
460
 
    current working directory.
461
 
    """
462
 
    result = []
463
 
    for filename in paths:
464
 
        try:
465
 
            result.append(tree.relpath(osutils.dereference_path(filename)))
466
 
        except errors.PathNotChild:
467
 
            raise errors.BzrCommandError("Files are in different branches")
468
 
    return result
 
458
    return spec.as_tree(branch)
469
459
 
470
460
 
471
461
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
473
463
                    old_label='a/', new_label='b/',
474
464
                    extra_trees=None,
475
465
                    path_encoding='utf8',
476
 
                    using=None):
 
466
                    using=None,
 
467
                    format_cls=None):
477
468
    """Show in text form the changes from one tree to another.
478
469
 
479
 
    to_file
480
 
        The output stream.
481
 
 
482
 
    specific_files
483
 
        Include only changes to these files - None for all changes.
484
 
 
485
 
    external_diff_options
486
 
        If set, use an external GNU diff and pass these options.
487
 
 
488
 
    extra_trees
489
 
        If set, more Trees to use for looking up file ids
490
 
 
491
 
    path_encoding
492
 
        If set, the path will be encoded as specified, otherwise is supposed
493
 
        to be utf8
 
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)
494
479
    """
 
480
    if format_cls is None:
 
481
        format_cls = DiffTree
495
482
    old_tree.lock_read()
496
483
    try:
497
484
        if extra_trees is not None:
499
486
                tree.lock_read()
500
487
        new_tree.lock_read()
501
488
        try:
502
 
            differ = DiffTree.from_trees_options(old_tree, new_tree, to_file,
503
 
                                                 path_encoding,
504
 
                                                 external_diff_options,
505
 
                                                 old_label, new_label, using)
 
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)
506
493
            return differ.show_diff(specific_files, extra_trees)
507
494
        finally:
508
495
            new_tree.unlock()
515
502
 
516
503
def _patch_header_date(tree, file_id, path):
517
504
    """Returns a timestamp suitable for use in a patch header."""
518
 
    mtime = tree.get_file_mtime(file_id, path)
519
 
    assert mtime is not None, \
520
 
        "got an mtime of None for file-id %s, path %s in tree %s" % (
521
 
                file_id, path, tree)
 
505
    try:
 
506
        mtime = tree.get_file_mtime(file_id, path)
 
507
    except errors.FileTimestampUnavailable:
 
508
        mtime = 0
522
509
    return timestamp.format_patch_date(mtime)
523
510
 
524
511
 
525
 
def _raise_if_nonexistent(paths, old_tree, new_tree):
526
 
    """Complain if paths are not in either inventory or tree.
527
 
 
528
 
    It's OK with the files exist in either tree's inventory, or 
529
 
    if they exist in the tree but are not versioned.
530
 
    
531
 
    This can be used by operations such as bzr status that can accept
532
 
    unknown or ignored files.
533
 
    """
534
 
    mutter("check paths: %r", paths)
535
 
    if not paths:
536
 
        return
537
 
    s = old_tree.filter_unversioned_files(paths)
538
 
    s = new_tree.filter_unversioned_files(s)
539
 
    s = [path for path in s if not new_tree.has_filename(path)]
540
 
    if s:
541
 
        raise errors.PathsDoNotExist(sorted(s))
542
 
 
543
 
 
544
 
@deprecated_function(one_three)
545
 
def get_prop_change(meta_modified):
546
 
    if meta_modified:
547
 
        return " (properties changed)"
548
 
    else:
549
 
        return  ""
550
 
 
551
512
def get_executable_change(old_is_x, new_is_x):
552
513
    descr = { True:"+x", False:"-x", None:"??" }
553
514
    if old_is_x != new_is_x:
728
689
            return self.CANNOT_DIFF
729
690
        from_label = '%s%s\t%s' % (self.old_label, old_path, old_date)
730
691
        to_label = '%s%s\t%s' % (self.new_label, new_path, new_date)
731
 
        return self.diff_text(from_file_id, to_file_id, from_label, to_label)
 
692
        return self.diff_text(from_file_id, to_file_id, from_label, to_label,
 
693
            old_path, new_path)
732
694
 
733
 
    def diff_text(self, from_file_id, to_file_id, from_label, to_label):
 
695
    def diff_text(self, from_file_id, to_file_id, from_label, to_label,
 
696
        from_path=None, to_path=None):
734
697
        """Diff the content of given files in two trees
735
698
 
736
699
        :param from_file_id: The id of the file in the from tree.  If None,
738
701
        :param to_file_id: The id of the file in the to tree.  This may refer
739
702
            to a different file from from_file_id.  If None,
740
703
            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.
741
706
        """
742
 
        def _get_text(tree, file_id):
 
707
        def _get_text(tree, file_id, path):
743
708
            if file_id is not None:
744
 
                return tree.get_file(file_id).readlines()
 
709
                return tree.get_file(file_id, path).readlines()
745
710
            else:
746
711
                return []
747
712
        try:
748
 
            from_text = _get_text(self.old_tree, from_file_id)
749
 
            to_text = _get_text(self.new_tree, to_file_id)
 
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)
750
715
            self.text_differ(from_label, from_text, to_label, to_text,
751
716
                             self.to_file)
752
717
        except errors.BinaryFile:
762
727
                 path_encoding='utf-8'):
763
728
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
764
729
        self.command_template = command_template
765
 
        self._root = tempfile.mkdtemp(prefix='bzr-diff-')
 
730
        self._root = osutils.mkdtemp(prefix='bzr-diff-')
766
731
 
767
732
    @classmethod
768
733
    def from_string(klass, command_string, old_tree, new_tree, to_file,
769
734
                    path_encoding='utf-8'):
770
 
        command_template = commands.shlex_split_unicode(command_string)
771
 
        command_template.extend(['%(old_path)s', '%(new_path)s'])
 
735
        command_template = cmdline.split(command_string)
 
736
        if '@' not in command_string:
 
737
            command_template.extend(['@old_path', '@new_path'])
772
738
        return klass(command_template, old_tree, new_tree, to_file,
773
739
                     path_encoding)
774
740
 
781
747
 
782
748
    def _get_command(self, old_path, new_path):
783
749
        my_map = {'old_path': old_path, 'new_path': new_path}
784
 
        return [t % my_map for t in self.command_template]
 
750
        return [AtTemplate(t).substitute(my_map) for t in
 
751
                self.command_template]
785
752
 
786
753
    def _execute(self, old_path, new_path):
787
754
        command = self._get_command(old_path, new_path)
797
764
        return proc.wait()
798
765
 
799
766
    def _try_symlink_root(self, tree, prefix):
800
 
        if not (getattr(tree, 'abspath', None) is not None
801
 
                and osutils.has_symlinks()):
 
767
        if (getattr(tree, 'abspath', None) is None
 
768
            or not osutils.host_os_dereferences_symlinks()):
802
769
            return False
803
770
        try:
804
771
            os.symlink(tree.abspath(''), osutils.pathjoin(self._root, prefix))
807
774
                raise
808
775
        return True
809
776
 
810
 
    def _write_file(self, file_id, tree, prefix, relpath):
 
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
        
811
782
        full_path = osutils.pathjoin(self._root, prefix, relpath)
812
 
        if self._try_symlink_root(tree, prefix):
 
783
        if not force_temp and self._try_symlink_root(tree, prefix):
813
784
            return full_path
814
785
        parent_dir = osutils.dirname(full_path)
815
786
        try:
826
797
                target.close()
827
798
        finally:
828
799
            source.close()
829
 
        osutils.make_readonly(full_path)
830
 
        mtime = tree.get_file_mtime(file_id)
831
 
        os.utime(full_path, (mtime, mtime))
 
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)
832
808
        return full_path
833
809
 
834
 
    def _prepare_files(self, file_id, old_path, new_path):
 
810
    def _prepare_files(self, file_id, old_path, new_path, force_temp=False,
 
811
                       allow_write_new=False):
835
812
        old_disk_path = self._write_file(file_id, self.old_tree, 'old',
836
 
                                         old_path)
 
813
                                         old_path, force_temp)
837
814
        new_disk_path = self._write_file(file_id, self.new_tree, 'new',
838
 
                                         new_path)
 
815
                                         new_path, force_temp,
 
816
                                         allow_write=allow_write_new)
839
817
        return old_disk_path, new_disk_path
840
818
 
841
819
    def finish(self):
842
 
        osutils.rmtree(self._root)
 
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))
843
826
 
844
827
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
845
828
        if (old_kind, new_kind) != ('file', 'file'):
846
829
            return DiffPath.CANNOT_DIFF
847
 
        self._prepare_files(file_id, old_path, new_path)
848
 
        self._execute(osutils.pathjoin('old', old_path),
849
 
                      osutils.pathjoin('new', new_path))
 
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()
850
856
 
851
857
 
852
858
class DiffTree(object):
913
919
        else:
914
920
            extra_factories = []
915
921
        if external_diff_options:
916
 
            assert isinstance(external_diff_options, basestring)
917
922
            opts = external_diff_options.split()
918
923
            def diff_file(olab, olines, nlab, nlines, to_file):
919
924
                external_diff(olab, olines, nlab, nlines, to_file, opts)
927
932
    def show_diff(self, specific_files, extra_trees=None):
928
933
        """Write tree diff to self.to_file
929
934
 
930
 
        :param sepecific_files: the specific files to compare (recursive)
 
935
        :param specific_files: the specific files to compare (recursive)
931
936
        :param extra_trees: extra trees to use for mapping paths to file_ids
932
937
        """
933
938
        try:
955
960
                return path.encode(self.path_encoding, "replace")
956
961
        for (file_id, paths, changed_content, versioned, parent, name, kind,
957
962
             executable) in sorted(iterator, key=changes_key):
958
 
            if parent == (None, None):
 
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):
959
966
                continue
960
967
            oldpath, newpath = paths
961
968
            oldpath_encoded = get_encoded_path(paths[0])
989
996
                self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
990
997
                                   newpath_encoded, prop_str))
991
998
            if changed_content:
992
 
                self.diff(file_id, oldpath, newpath)
 
999
                self._diff(file_id, oldpath, newpath, kind[0], kind[1])
993
1000
                has_changes = 1
994
1001
            if renamed:
995
1002
                has_changes = 1
1010
1017
            new_kind = self.new_tree.kind(file_id)
1011
1018
        except (errors.NoSuchId, errors.NoSuchFile):
1012
1019
            new_kind = None
1013
 
 
 
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):
1014
1024
        result = DiffPath._diff_many(self.differs, file_id, old_path,
1015
1025
                                       new_path, old_kind, new_kind)
1016
1026
        if result is DiffPath.CANNOT_DIFF:
1018
1028
            if error_path is None:
1019
1029
                error_path = old_path
1020
1030
            raise errors.NoDiffFound(error_path)
 
1031
 
 
1032
 
 
1033
format_registry = Registry()
 
1034
format_registry.register('default', DiffTree)