← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2008-01-03 22:14:40 UTC
  • mto: This revision was merged to the branch mainline in revision 3241.
  • Revision ID: abentley@panoramicfeedback.com-20080103221440-0y6atamnscjnoh9s
Updates from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
823
823
        conflicts = []
824
824
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
825
825
                                self._removed_id))
826
 
        active_tree_ids = set((f for f in self._tree.iter_all_file_ids() if
827
 
                               f not in removed_tree_ids))
 
826
        all_ids = self._tree.all_file_ids()
 
827
        active_tree_ids = all_ids.difference(removed_tree_ids)
828
828
        for trans_id, file_id in self._new_id.iteritems():
829
829
            if file_id in active_tree_ids:
830
830
                old_trans_id = self.trans_id_tree_file_id(file_id)
1344
1344
 
1345
1345
def _build_tree(tree, wt, accelerator_tree):
1346
1346
    """See build_tree."""
1347
 
    if len(list(wt)) > 1:  # more than just a root
1348
 
        raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
 
1347
    for num, _unused in enumerate(wt):
 
1348
        if num > 0:  # more than just a root
 
1349
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
1349
1350
    file_trans_id = {}
1350
1351
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1351
1352
    pp = ProgressPhase("Build phase", 2, top_pb)