← 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: Jelmer Vernooij
  • Date: 2016-04-03 16:32:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6617.
  • Revision ID: jelmer@jelmer.uk-20160403163231-h72bo0uyek2gikw0
https://launchpad.net/bugs/1565503
Don't put French text in doc/en/user-reference when LANGUAGE=fr_CH.UTF_8.

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