← 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: Jonathan Riddell
  • Date: 2011-09-20 11:01:37 UTC
  • mto: This revision was merged to the branch mainline in revision 6153.
  • Revision ID: jriddell@canonical.com-20110920110137-mrps089ulocx1skd
gettext() in plugin.py and hooks.py

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
 
from bzrlib.repository import install_revision
 
23
from bzrlib.vf_repository import install_revision
24
24
from bzrlib.trace import note
 
25
from bzrlib.i18n import gettext
25
26
 
26
27
 
27
28
def install_bundle(repository, bundle_reader):
28
29
    custom_install = getattr(bundle_reader, 'install', None)
29
30
    if custom_install is not None:
30
31
        return custom_install(repository)
31
 
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
32
    pb = ui.ui_factory.nested_progress_bar()
32
33
    repository.lock_write()
33
34
    try:
34
35
        real_revisions = bundle_reader.real_revisions
35
36
        for i, revision in enumerate(reversed(real_revisions)):
36
 
            pb.update("Install revisions",i, len(real_revisions))
 
37
            pb.update(gettext("Install revisions"),i, len(real_revisions))
37
38
            if repository.has_revision(revision.revision_id):
38
39
                continue
39
40
            cset_tree = bundle_reader.revision_tree(repository,
47
48
def merge_bundle(reader, tree, check_clean, merge_type,
48
49
                    reprocess, show_base, change_reporter=None):
49
50
    """Merge a revision bundle into the current tree."""
50
 
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
51
    pb = ui.ui_factory.nested_progress_bar()
51
52
    try:
52
53
        pp = ProgressPhase("Merge phase", 6, pb)
53
54
        pp.next_phase()
64
65
        merger.pp.next_phase()
65
66
        merger.find_base()
66
67
        if merger.base_rev_id == merger.other_rev_id:
67
 
            note("Nothing to do.")
 
68
            note(gettext("Nothing to do."))
68
69
            return 0
69
70
        merger.merge_type = merge_type
70
71
        merger.show_base = show_base