/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-12-20 15:21:48 UTC
  • mfrom: (3134 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3135.
  • Revision ID: abentley@panoramicfeedback.com-20071220152148-rn32up72gm3gankf
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
151
151
        self._dirstate = None
152
152
        self._inventory = None
153
153
        #-------------
 
154
        self._setup_directory_is_tree_reference()
154
155
        self._detect_case_handling()
155
156
 
156
157
    @needs_tree_write_lock
1754
1755
        # NB: show_status depends on being able to pass in non-versioned files
1755
1756
        # and report them as unknown
1756
1757
        # TODO: handle extra trees in the dirstate.
1757
 
        # TODO: handle comparisons as an empty tree as a different special
1758
 
        # case? mbp 20070226
1759
 
        if (extra_trees or (self.source._revision_id == NULL_REVISION)
1760
 
            or specific_files == []):
 
1758
        if (extra_trees or specific_files == []):
1761
1759
            # we can't fast-path these cases (yet)
1762
1760
            for f in super(InterDirStateTree, self)._iter_changes(
1763
1761
                include_unchanged, specific_files, pb, extra_trees,
1765
1763
                yield f
1766
1764
            return
1767
1765
        parent_ids = self.target.get_parent_ids()
1768
 
        assert (self.source._revision_id in parent_ids), \
 
1766
        assert (self.source._revision_id in parent_ids
 
1767
                or self.source._revision_id == NULL_REVISION), \
1769
1768
                "revision {%s} is not stored in {%s}, but %s " \
1770
1769
                "can only be used for trees stored in the dirstate" \
1771
1770
                % (self.source._revision_id, self.target, self._iter_changes)
1778
1777
                "Failure: source._revision_id: %s not in target.parent_ids(%s)" % (
1779
1778
                self.source._revision_id, parent_ids)
1780
1779
            source_index = 1 + parent_ids.index(self.source._revision_id)
1781
 
            indices = (source_index,target_index)
 
1780
            indices = (source_index, target_index)
1782
1781
        # -- make all specific_files utf8 --
1783
1782
        if specific_files:
1784
1783
            specific_files_utf8 = set()