← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/foreign.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-06 10:15:06 UTC
  • mfrom: (6195.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20111006101506-mychax14dy7yjee2
(vila) Tag bzr-2.5b2 missed during freeze (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/foreign.py
31
31
    registry,
32
32
    transform,
33
33
    )
 
34
from bzrlib.i18n import gettext
34
35
""")
35
36
 
36
37
class VcsMapping(object):
302
303
        stored_loc = source_branch.get_push_location()
303
304
        if location is None:
304
305
            if stored_loc is None:
305
 
                raise BzrCommandError("No push location known or specified.")
 
306
                raise BzrCommandError(gettext("No push location known or specified."))
306
307
            else:
307
308
                display_url = urlutils.unescape_for_display(stored_loc,
308
309
                        self.outf.encoding)
309
 
                self.outf.write("Using saved location: %s\n" % display_url)
 
310
                self.outf.write(
 
311
                       gettext("Using saved location: %s\n") % display_url)
310
312
                location = stored_loc
311
313
 
312
314
        bzrdir = BzrDir.open(location)
316
318
            try:
317
319
                push_result = source_branch.push(target_branch, lossy=True)
318
320
            except errors.LossyPushToSameVCS:
319
 
                raise BzrCommandError("%r and %r are in the same VCS, lossy "
320
 
                    "push not necessary. Please use regular push." %
321
 
                    (source_branch, target_branch))
 
321
                raise BzrCommandError(gettext("{0!r} and {1!r} are in the same VCS, lossy "
 
322
                    "push not necessary. Please use regular push.").format(
 
323
                    source_branch, target_branch))
322
324
            # We successfully created the target, remember it
323
325
            if source_branch.get_push_location() is None or remember:
324
326
                source_branch.set_push_location(target_branch.base)