← 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: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
16
"""\
18
17
This contains functionality for installing bundles into repositories
19
18
"""
20
19
 
21
 
from __future__ import absolute_import
22
 
 
23
20
from bzrlib import ui
24
 
from bzrlib.i18n import gettext
 
21
from bzrlib.progress import ProgressPhase
25
22
from bzrlib.merge import Merger
26
 
from bzrlib.progress import ProgressPhase
 
23
from bzrlib.vf_repository import install_revision
27
24
from bzrlib.trace import note
28
 
from bzrlib.vf_repository import install_revision
29
25
 
30
26
 
31
27
def install_bundle(repository, bundle_reader):
37
33
    try:
38
34
        real_revisions = bundle_reader.real_revisions
39
35
        for i, revision in enumerate(reversed(real_revisions)):
40
 
            pb.update(gettext("Install revisions"),i, len(real_revisions))
 
36
            pb.update("Install revisions",i, len(real_revisions))
41
37
            if repository.has_revision(revision.revision_id):
42
38
                continue
43
39
            cset_tree = bundle_reader.revision_tree(repository,
68
64
        merger.pp.next_phase()
69
65
        merger.find_base()
70
66
        if merger.base_rev_id == merger.other_rev_id:
71
 
            note(gettext("Nothing to do."))
 
67
            note("Nothing to do.")
72
68
            return 0
73
69
        merger.merge_type = merge_type
74
70
        merger.show_base = show_base