← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-09 20:23:07 UTC
  • mfrom: (4265.1.4 bbc-merge)
  • Revision ID: pqm@pqm.ubuntu.com-20090409202307-n0depb16qepoe21o
(jam) Change _fetch_uses_deltas = False for CHK repos until we can
        write a better fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
"""\
17
17
This contains functionality for installing bundles into repositories
18
18
"""
25
25
 
26
26
 
27
27
def install_bundle(repository, bundle_reader):
 
28
    custom_install = getattr(bundle_reader, 'install', None)
 
29
    if custom_install is not None:
 
30
        return custom_install(repository)
28
31
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
29
32
    repository.lock_write()
30
33
    try:
41
44
        pb.finished()
42
45
 
43
46
 
44
 
def merge_bundle(reader, tree, check_clean, merge_type, 
 
47
def merge_bundle(reader, tree, check_clean, merge_type,
45
48
                    reprocess, show_base, change_reporter=None):
46
49
    """Merge a revision bundle into the current tree."""
47
50
    pb = bzrlib.ui.ui_factory.nested_progress_bar()