/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: Aaron Bentley
  • Date: 2008-10-16 21:47:05 UTC
  • mfrom: (3782 +trunk)
  • mto: (0.14.25 prepare-shelf)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081016214705-9y3mj4era3zw3skh
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1846
1846
                      require_versioned=True, want_unversioned=False):
1847
1847
        """See InterTree.iter_changes.
1848
1848
 
1849
 
        This implementation does not support include_unchanged, specific_files,
1850
 
        or want_unversioned.  extra_trees, require_versioned, and pb are
1851
 
        ignored.
 
1849
        This has a fast path that is only used when the from_tree matches
 
1850
        the transform tree, and no fancy options are supplied.
1852
1851
        """
1853
 
        if from_tree is not self._transform._tree:
 
1852
        if (from_tree is not self._transform._tree or include_unchanged or
 
1853
            specific_files or want_unversioned):
1854
1854
            return tree.InterTree(from_tree, self).iter_changes(
1855
1855
                include_unchanged=include_unchanged,
1856
1856
                specific_files=specific_files,
1858
1858
                extra_trees=extra_trees,
1859
1859
                require_versioned=require_versioned,
1860
1860
                want_unversioned=want_unversioned)
1861
 
        if include_unchanged:
1862
 
            raise ValueError('include_unchanged is not supported')
1863
 
        if specific_files is not None:
1864
 
            raise ValueError('specific_files is not supported')
1865
1861
        if want_unversioned:
1866
1862
            raise ValueError('want_unversioned is not supported')
1867
1863
        return self._transform.iter_changes()