← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/foreign.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/foreign.py
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
 
 
18
17
"""Foreign branch utilities."""
19
18
 
 
19
from __future__ import absolute_import
 
20
 
20
21
 
21
22
from bzrlib.branch import (
22
23
    Branch,
31
32
    registry,
32
33
    transform,
33
34
    )
 
35
from bzrlib.i18n import gettext
34
36
""")
35
37
 
36
38
class VcsMapping(object):
263
265
    branch unless the --no-rebase option is used, in which case 
264
266
    the two branches will be out of sync after the push. 
265
267
    """
266
 
    hidden = True
267
268
    takes_args = ['location?']
268
269
    takes_options = [
269
270
        'remember',
282
283
    def run(self, location=None, remember=False, directory=None,
283
284
            no_rebase=False, strict=None):
284
285
        from bzrlib import urlutils
285
 
        from bzrlib.bzrdir import BzrDir
 
286
        from bzrlib.controldir import ControlDir
286
287
        from bzrlib.errors import BzrCommandError, NoWorkingTree
287
288
        from bzrlib.workingtree import WorkingTree
288
289
 
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
 
        bzrdir = BzrDir.open(location)
313
 
        target_branch = bzrdir.open_branch()
 
314
        controldir = ControlDir.open(location)
 
315
        target_branch = controldir.open_branch()
314
316
        target_branch.lock_write()
315
317
        try:
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)