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

  • Committer: Alexander Belchenko
  • Date: 2007-09-05 08:18:57 UTC
  • mfrom: (2799 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2800.
  • Revision ID: bialix@ukr.net-20070905081857-me1osc2lpuzq6ur1
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
679
679
        lookup_trees = [self.source]
680
680
        if extra_trees:
681
681
             lookup_trees.extend(extra_trees)
682
 
        specific_file_ids = self.target.paths2ids(specific_files,
683
 
            lookup_trees, require_versioned=require_versioned)
 
682
        if specific_files == []:
 
683
            specific_file_ids = []
 
684
        else:
 
685
            specific_file_ids = self.target.paths2ids(specific_files,
 
686
                lookup_trees, require_versioned=require_versioned)
684
687
        if want_unversioned:
685
 
            all_unversioned = sorted([(p.split('/'), p) for p in self.target.extras()
686
 
                if not specific_files or
 
688
            all_unversioned = sorted([(p.split('/'), p) for p in
 
689
                                     self.target.extras()
 
690
                if specific_files is None or
687
691
                    osutils.is_inside_any(specific_files, p)])
688
692
            all_unversioned = deque(all_unversioned)
689
693
        else: