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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-18 13:48:45 UTC
  • mto: This revision was merged to the branch mainline in revision 7353.
  • Revision ID: jelmer@jelmer.uk-20190618134845-nbsmnswjk6gv4l38
Drop file_id return value from Tree.iter_references.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/branch.py
1409
1409
                                           hardlink=hardlink)
1410
1410
        basis_tree = tree.basis_tree()
1411
1411
        with basis_tree.lock_read():
1412
 
            for path, file_id in basis_tree.iter_references():
1413
 
                reference_parent = self.reference_parent(path, file_id)
 
1412
            for path in basis_tree.iter_references():
 
1413
                reference_parent = self.reference_parent(path)
1414
1414
                reference_parent.create_checkout(
1415
1415
                    tree.abspath(path),
1416
1416
                    basis_tree.get_reference_revision(path), lightweight)
1423
1423
        """
1424
1424
        raise NotImplementedError(self.reconcile)
1425
1425
 
1426
 
    def reference_parent(self, path, file_id=None, possible_transports=None):
 
1426
    def reference_parent(self, path, possible_transports=None):
1427
1427
        """Return the parent branch for a tree-reference file_id
1428
1428
 
1429
 
        :param path: The path of the file_id in the tree
1430
 
        :param file_id: Optional file_id of the tree reference
1431
 
        :return: A branch associated with the file_id
 
1429
        :param path: The path of the nested tree in the tree
 
1430
        :return: A branch associated with the nested tree
1432
1431
        """
1433
1432
        # FIXME should provide multiple branches, based on config
1434
1433
        return Branch.open(self.controldir.root_transport.clone(path).base,