/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-09-30 08:49:08 UTC
  • mto: (5050.17.28 2.2)
  • mto: This revision was merged to the branch mainline in revision 5474.
  • Revision ID: v.ladeuil+lp@free.fr-20100930084908-jyz8y77ybwlu0ae4
https://launchpad.net/bugs/651706
tests/ssl_certs/ca.crt is needed for running https tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1282
1282
    def add(self, entry):
1283
1283
        """Add entry to inventory.
1284
1284
 
1285
 
        To add  a file to a branch ready to be committed, use Branch.add,
1286
 
        which calls this.
1287
 
 
1288
1285
        :return: entry
1289
1286
        """
1290
1287
        if entry.file_id in self._byid:
1652
1649
            # parent_to_children with at least the tree root.)
1653
1650
            return other
1654
1651
        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
 
1652
        remaining_children = collections.deque(parent_to_children[self.root_id])
1660
1653
        while remaining_children:
1661
1654
            file_id = remaining_children.popleft()
1662
1655
            ie = cache[file_id]