/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/inventory.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-08 09:50:27 UTC
  • mto: (5284.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5285.
  • Revision ID: v.ladeuil+lp@free.fr-20100608095027-nxvyibss2uefgcg1
Respect --exclude-common-ancestry for linear ancestries.

* bzrlib/tests/test_log.py:
(TestLogExcludeAncestry.test_merge_sorted_simple_revnos_exclude_ancestry):
There are two different code paths that exhibit bug #575631.

* bzrlib/log.py:
(_calc_view_revisions, _generate_flat_revisions): Propagate
exclude_common_ancestry into more code paths.
(_linear_view_revisions): Don't yield start_rev_id when we want to
exclude the common ancestry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1652
1652
            # parent_to_children with at least the tree root.)
1653
1653
            return other
1654
1654
        cache = self._fileid_to_entry_cache
1655
 
        try:
1656
 
            remaining_children = collections.deque(parent_to_children[self.root_id])
1657
 
        except:
1658
 
            import pdb; pdb.set_trace()
1659
 
            raise
 
1655
        remaining_children = collections.deque(parent_to_children[self.root_id])
1660
1656
        while remaining_children:
1661
1657
            file_id = remaining_children.popleft()
1662
1658
            ie = cache[file_id]