← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-07-19 14:26:11 UTC
  • mfrom: (5346.4.6 cleanup)
  • Revision ID: pqm@pqm.ubuntu.com-20100719142611-fbhst4ivcngc32d5
(mbp) tree_files and internal_tree files moved to WorkingTree (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
420
420
 
421
421
    # Get the specific files (all files is None, no files is [])
422
422
    if make_paths_wt_relative and working_tree is not None:
423
 
        from bzrlib.builtins import safe_relpath_files
424
 
        other_paths = safe_relpath_files(working_tree, other_paths,
425
 
        apply_view=apply_view)
 
423
        other_paths = working_tree.safe_relpath_files(
 
424
            other_paths,
 
425
            apply_view=apply_view)
426
426
    specific_files.extend(other_paths)
427
427
    if len(specific_files) == 0:
428
428
        specific_files = None