← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/foreign.py

Abbreviate pack_stat struct format to '>6L'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/foreign.py
20
20
 
21
21
from bzrlib.branch import (
22
22
    Branch,
23
 
    InterBranch,
24
23
    )
25
24
from bzrlib.commands import Command, Option
26
25
from bzrlib.repository import Repository
32
31
    registry,
33
32
    transform,
34
33
    )
 
34
from bzrlib.i18n import gettext
35
35
""")
36
36
 
37
37
class VcsMapping(object):
303
303
        stored_loc = source_branch.get_push_location()
304
304
        if location is None:
305
305
            if stored_loc is None:
306
 
                raise BzrCommandError("No push location known or specified.")
 
306
                raise BzrCommandError(gettext("No push location known or specified."))
307
307
            else:
308
308
                display_url = urlutils.unescape_for_display(stored_loc,
309
309
                        self.outf.encoding)
310
 
                self.outf.write("Using saved location: %s\n" % display_url)
 
310
                self.outf.write(
 
311
                       gettext("Using saved location: %s\n") % display_url)
311
312
                location = stored_loc
312
313
 
313
314
        bzrdir = BzrDir.open(location)
315
316
        target_branch.lock_write()
316
317
        try:
317
318
            try:
318
 
                push_result = source_branch.lossy_push(target_branch)
 
319
                push_result = source_branch.push(target_branch, lossy=True)
319
320
            except errors.LossyPushToSameVCS:
320
 
                raise BzrCommandError("%r and %r are in the same VCS, lossy "
321
 
                    "push not necessary. Please use regular push." %
322
 
                    (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))
323
324
            # We successfully created the target, remember it
324
325
            if source_branch.get_push_location() is None or remember:
325
326
                source_branch.set_push_location(target_branch.base)
338
339
            push_result.report(self.outf)
339
340
        finally:
340
341
            target_branch.unlock()
341
 
 
342
 
 
343
 
class InterToForeignBranch(InterBranch):
344
 
 
345
 
    def lossy_push(self, stop_revision=None):
346
 
        """Push deltas into another branch.
347
 
 
348
 
        :note: This does not, like push, retain the revision ids from 
349
 
            the source branch and will, rather than adding bzr-specific 
350
 
            metadata, push only those semantics of the revision that can be 
351
 
            natively represented by this branch' VCS.
352
 
 
353
 
        :param target: Target branch
354
 
        :param stop_revision: Revision to push, defaults to last revision.
355
 
        :return: BranchPushResult with an extra member revidmap: 
356
 
            A dictionary mapping revision ids from the target branch 
357
 
            to new revision ids in the target branch, for each 
358
 
            revision that was pushed.
359
 
        """
360
 
        raise NotImplementedError(self.lossy_push)