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

  • Committer: Jelmer Vernooij
  • Date: 2017-12-03 22:21:17 UTC
  • mfrom: (6825.5.2 all-paths)
  • Revision ID: jelmer@jelmer.uk-20171203222117-strqpyuxkux0oomt
Merge lp:~jelmer/brz/all-paths.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
2070
2070
        tree_ids.update(viewvalues(self._transform._new_id))
2071
2071
        return tree_ids
2072
2072
 
2073
 
    def __iter__(self):
2074
 
        return iter(self.all_file_ids())
 
2073
    def all_versioned_paths(self):
 
2074
        return {self.id2path(fid) for fid in self.all_file_ids()}
2075
2075
 
2076
2076
    def _has_id(self, file_id, fallback_check):
2077
2077
        if file_id in self._transform._r_new_id:
2572
2572
 
2573
2573
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2574
2574
    """See build_tree."""
2575
 
    for num, _unused in enumerate(wt.all_file_ids()):
 
2575
    for num, _unused in enumerate(wt.all_versioned_paths()):
2576
2576
        if num > 0:  # more than just a root
2577
2577
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2578
2578
    file_trans_id = {}
2599
2599
        try:
2600
2600
            deferred_contents = []
2601
2601
            num = 0
2602
 
            total = len(tree.all_file_ids())
 
2602
            total = len(tree.all_versioned_paths())
2603
2603
            if delta_from_tree:
2604
2604
                precomputed_delta = []
2605
2605
            else: