← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-20 13:31:43 UTC
  • mfrom: (1551.15.54 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070720133143-r74lo566tluurmfp
fix annotate merge to not require Tree.get_weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
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