← 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: Benoît Pierre
  • Date: 2009-11-02 22:24:29 UTC
  • mto: (4634.96.1 integration-2.0)
  • mto: This revision was merged to the branch mainline in revision 4798.
  • Revision ID: benoit.pierre@gmail.com-20091102222429-xqdyo6n8odh3xbbd
Small fix for handling of short option names in shellcomplete_on_options.

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, 2011 Canonical Ltd
 
1
# Copyright (C) 2006 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
 
from bzrlib import ui
 
20
import bzrlib.ui
21
21
from bzrlib.progress import ProgressPhase
22
22
from bzrlib.merge import Merger
23
 
from bzrlib.vf_repository import install_revision
 
23
from bzrlib.repository import install_revision
24
24
from bzrlib.trace import note
25
25
 
26
26
 
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 = ui.ui_factory.nested_progress_bar()
 
31
    pb = bzrlib.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 = ui.ui_factory.nested_progress_bar()
 
50
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
51
51
    try:
52
52
        pp = ProgressPhase("Merge phase", 6, pb)
53
53
        pp.next_phase()
54
54
        install_bundle(tree.branch.repository, reader)
55
 
        merger = Merger(tree.branch, this_tree=tree,
 
55
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
56
56
                        change_reporter=change_reporter)
57
57
        merger.pp = pp
58
58
        merger.pp.next_phase()
59
 
        if check_clean and tree.has_changes():
60
 
            raise errors.UncommittedChanges(self)
 
59
        merger.check_basis(check_clean, require_commits=False)
61
60
        merger.other_rev_id = reader.target
62
61
        merger.other_tree = merger.revision_tree(reader.target)
63
62
        merger.other_basis = reader.target