← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin Pool
  • Date: 2010-07-16 13:53:26 UTC
  • mto: (5346.4.3 cleanup)
  • mto: This revision was merged to the branch mainline in revision 5350.
  • Revision ID: mbp@canonical.com-20100716135326-a3d5bh29w64ylh5p
* `PathNotChild` should not give a traceback.
  (Martin Pool, bug 98735)

* `FileInWrongBranch` is deprecated in favour of `PathNotChild` and no
  longer raised.
  (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
 
        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")
 
423
        from bzrlib.builtins import safe_relpath_files
 
424
        other_paths = safe_relpath_files(working_tree, other_paths,
 
425
        apply_view=apply_view)
429
426
    specific_files.extend(other_paths)
430
427
    if len(specific_files) == 0:
431
428
        specific_files = None