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

  • Committer: John Arbash Meinel
  • Date: 2008-10-17 19:58:53 UTC
  • mfrom: (3783 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3785.
  • Revision ID: john@arbash-meinel.com-20081017195853-i31d3g7sur1prgvi
Merge bzr.dev 3783, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1753
1753
                      require_versioned=True, want_unversioned=False):
1754
1754
        """See InterTree.iter_changes.
1755
1755
 
1756
 
        This implementation does not support include_unchanged, specific_files,
1757
 
        or want_unversioned.  extra_trees, require_versioned, and pb are
1758
 
        ignored.
 
1756
        This has a fast path that is only used when the from_tree matches
 
1757
        the transform tree, and no fancy options are supplied.
1759
1758
        """
1760
 
        if from_tree is not self._transform._tree:
 
1759
        if (from_tree is not self._transform._tree or include_unchanged or
 
1760
            specific_files or want_unversioned):
1761
1761
            return tree.InterTree(from_tree, self).iter_changes(
1762
1762
                include_unchanged=include_unchanged,
1763
1763
                specific_files=specific_files,
1765
1765
                extra_trees=extra_trees,
1766
1766
                require_versioned=require_versioned,
1767
1767
                want_unversioned=want_unversioned)
1768
 
        if include_unchanged:
1769
 
            raise ValueError('include_unchanged is not supported')
1770
 
        if specific_files is not None:
1771
 
            raise ValueError('specific_files is not supported')
1772
1768
        if want_unversioned:
1773
1769
            raise ValueError('want_unversioned is not supported')
1774
1770
        return self._transform.iter_changes()