/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/bundle/apply_bundle.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
This contains functionality for installing bundles into repositories
18
18
"""
19
19
 
20
 
import bzrlib.ui
 
20
from bzrlib import ui
21
21
from bzrlib.progress import ProgressPhase
22
22
from bzrlib.merge import Merger
23
23
from bzrlib.repository import install_revision
28
28
    custom_install = getattr(bundle_reader, 'install', None)
29
29
    if custom_install is not None:
30
30
        return custom_install(repository)
31
 
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
31
    pb = ui.ui_factory.nested_progress_bar()
32
32
    repository.lock_write()
33
33
    try:
34
34
        real_revisions = bundle_reader.real_revisions
47
47
def merge_bundle(reader, tree, check_clean, merge_type,
48
48
                    reprocess, show_base, change_reporter=None):
49
49
    """Merge a revision bundle into the current tree."""
50
 
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
50
    pb = ui.ui_factory.nested_progress_bar()
51
51
    try:
52
52
        pp = ProgressPhase("Merge phase", 6, pb)
53
53
        pp.next_phase()