← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: v.ladeuil+lp at free
  • Date: 2007-05-18 18:20:31 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070518182031-gbg2cgidv5l20x9p
Takes Robert comments into account.

* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Write a better explanation.

* bzrlib/tests/test_init.py:
(InstrumentedTransport): Just make hooks a class attribute.
(InstrumentedTransport._get_FTP): Run hook directly in the for
loop.
(TransportHooks.run_hook, TransportHooks.uninstall_hook): Not
needed. The hooks should be cleaned up by the test itself.
(TestInit.setUp.cleanup): Resset to default hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
181
181
        :param entry_vf: The entry versioned file, if its already available.
182
182
        """
183
183
        def get_ancestors(weave, entry):
184
 
            return set(weave.get_ancestry(entry.revision, topo_sorted=False))
 
184
            return set(weave.get_ancestry(entry.revision))
185
185
        # revision:ie mapping for each ie found in previous_inventories.
186
186
        candidates = {}
187
187
        # revision:ie mapping with one revision for each head.
609
609
 
610
610
        if self.file_id not in checker.checked_weaves:
611
611
            mutter('check weave {%s}', self.file_id)
612
 
            w = tree._get_weave(self.file_id)
 
612
            w = tree.get_weave(self.file_id)
613
613
            # Not passing a progress bar, because it creates a new
614
614
            # progress, which overwrites the current progress,
615
615
            # and doesn't look nice
616
616
            w.check()
617
617
            checker.checked_weaves[self.file_id] = True
618
618
        else:
619
 
            w = tree._get_weave(self.file_id)
 
619
            w = tree.get_weave(self.file_id)
620
620
 
621
621
        mutter('check version {%s} of {%s}', tree_revision_id, self.file_id)
622
622
        checker.checked_text_cnt += 1
1047
1047
                        child_dirs.append((child_relpath+'/', child_ie))
1048
1048
            stack.extend(reversed(child_dirs))
1049
1049
 
1050
 
    def make_entry(self, kind, name, parent_id, file_id=None):
1051
 
        """Simple thunk to bzrlib.inventory.make_entry."""
1052
 
        return make_entry(kind, name, parent_id, file_id)
1053
 
 
1054
1050
    def entries(self):
1055
1051
        """Return list of (path, ie) for all entries except the root.
1056
1052