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

  • Committer: Aaron Bentley
  • Date: 2007-09-13 01:54:49 UTC
  • mfrom: (2817 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2826.
  • Revision ID: aaron.bentley@utoronto.ca-20070913015449-bjjw2njf3in5roq7
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1717
1717
        # TODO: handle extra trees in the dirstate.
1718
1718
        # TODO: handle comparisons as an empty tree as a different special
1719
1719
        # case? mbp 20070226
1720
 
        if extra_trees or (self.source._revision_id == NULL_REVISION):
 
1720
        if (extra_trees or (self.source._revision_id == NULL_REVISION)
 
1721
            or specific_files == []):
1721
1722
            # we can't fast-path these cases (yet)
1722
1723
            for f in super(InterDirStateTree, self)._iter_changes(
1723
1724
                include_unchanged, specific_files, pb, extra_trees,