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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-14 13:52:21 UTC
  • mfrom: (6024.1.3 unbreak-transform)
  • Revision ID: pqm@pqm.ubuntu.com-20110714135221-785gbmtlr9zmlifl
Small TreeTransform fixes (Aaron Bentley).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
231
231
        new_roots = [k for k, v in self._new_parent.iteritems() if v is
232
232
                     ROOT_PARENT]
233
233
        if len(new_roots) < 1:
234
 
            if self.final_kind(self.root) is None:
235
 
                self.cancel_deletion(self.root)
236
 
            if self.final_file_id(self.root) is None:
237
 
                self.version_file(self.tree_file_id(self.root),
238
 
                                     self.root)
239
234
            return
240
235
        if len(new_roots) != 1:
241
236
            raise ValueError('A tree cannot have two roots!')
1753
1748
                mover.apply_deletions()
1754
1749
        finally:
1755
1750
            child_pb.finished()
 
1751
        if self.final_file_id(self.root) is None:
 
1752
            inventory_delta = [e for e in inventory_delta if e[0] != '']
1756
1753
        self._tree.apply_inventory_delta(inventory_delta)
1757
1754
        self._apply_observed_sha1s()
1758
1755
        self._done = True