← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Alexander Belchenko
  • Date: 2008-03-17 22:16:52 UTC
  • mfrom: (3290 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3295.
  • Revision ID: bialix@ukr.net-20080317221652-gwq1ohxini63zhum
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1760
1760
    _matching_to_tree_format = WorkingTreeFormat4()
1761
1761
    _test_mutable_trees_to_test_trees = make_source_parent_tree
1762
1762
 
1763
 
    def _iter_changes(self, include_unchanged=False,
 
1763
    def iter_changes(self, include_unchanged=False,
1764
1764
                      specific_files=None, pb=None, extra_trees=[],
1765
1765
                      require_versioned=True, want_unversioned=False):
1766
1766
        """Return the changes from source to target.
1767
1767
 
1768
 
        :return: An iterator that yields tuples. See InterTree._iter_changes
 
1768
        :return: An iterator that yields tuples. See InterTree.iter_changes
1769
1769
            for details.
1770
1770
        :param specific_files: An optional list of file paths to restrict the
1771
1771
            comparison to. When mapping filenames to ids, all matches in all
1790
1790
        # TODO: handle extra trees in the dirstate.
1791
1791
        if (extra_trees or specific_files == []):
1792
1792
            # we can't fast-path these cases (yet)
1793
 
            for f in super(InterDirStateTree, self)._iter_changes(
 
1793
            for f in super(InterDirStateTree, self).iter_changes(
1794
1794
                include_unchanged, specific_files, pb, extra_trees,
1795
1795
                require_versioned, want_unversioned=want_unversioned):
1796
1796
                yield f
1800
1800
                or self.source._revision_id == NULL_REVISION), \
1801
1801
                "revision {%s} is not stored in {%s}, but %s " \
1802
1802
                "can only be used for trees stored in the dirstate" \
1803
 
                % (self.source._revision_id, self.target, self._iter_changes)
 
1803
                % (self.source._revision_id, self.target, self.iter_changes)
1804
1804
        target_index = 0
1805
1805
        if self.source._revision_id == NULL_REVISION:
1806
1806
            source_index = None