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

  • Committer: Vincent Ladeuil
  • Date: 2007-06-05 15:52:12 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070605155212-k2za98dhobeikxhn
Fix pull multiple connections.

* bzrlib/builtins.py:
(cmd_pull.run): If 'location' wasn't a bundle, the transport may
be reused.

* bzrlib/branch.py:
(Branch.open_from_transport): New method.

* bzrlib/bundle/__init__.py:
(read_mergeable_from_transport): New method.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
122
122
    def open_downlevel(base):
123
123
        """Open a branch which may be of an old format."""
124
124
        return Branch.open(base, _unsupported=True)
125
 
        
 
125
 
126
126
    @staticmethod
127
127
    def open(base, _unsupported=False):
128
128
        """Open the branch rooted at base.
134
134
        return control.open_branch(_unsupported)
135
135
 
136
136
    @staticmethod
 
137
    def open_from_transport(transport, _unsupported=False):
 
138
        """Open the branch rooted at transport"""
 
139
        control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
 
140
        return control.open_branch(_unsupported)
 
141
 
 
142
    @staticmethod
137
143
    def open_containing(url):
138
144
        """Open an existing branch which contains url.
139
145