← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-27 18:18:22 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1887.
  • Revision ID: john@arbash-meinel.com-20060727181822-56f20d32c9710761
clean up comment.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1171
1171
                raise BzrCommandError("Files are in different branches")
1172
1172
            file_list = None
1173
1173
        except NotBranchError:
1174
 
            # Don't raise an error when bzr diff is called from
1175
 
            # outside a working tree.
1176
1174
            if (revision is not None and len(revision) == 2
1177
1175
                and not revision[0].needs_branch()
1178
1176
                and not revision[1].needs_branch()):
 
1177
                # If both revision specs include a branch, we can
 
1178
                # diff them without needing a local working tree
1179
1179
                tree1, tree2 = None, None
1180
1180
            else:
1181
1181
                raise