/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Robert Collins
  • Date: 2009-08-04 04:36:34 UTC
  • mfrom: (4583 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090804043634-2iu9wpcgs273i97s
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
70
70
    do_catching_redirections,
71
71
    get_transport,
72
72
    local,
73
 
    remote as remote_transport,
74
73
    )
75
74
from bzrlib.weave import Weave
76
75
""")
1234
1233
        return result
1235
1234
 
1236
1235
    def push_branch(self, source, revision_id=None, overwrite=False, 
1237
 
        remember=False):
 
1236
        remember=False, create_prefix=False):
1238
1237
        """Push the source branch into this BzrDir."""
1239
1238
        br_to = None
1240
1239
        # If we can open a branch, use its direct repository, otherwise see
2358
2357
    def set_branch_format(self, format):
2359
2358
        self._branch_format = format
2360
2359
 
2361
 
    def require_stacking(self, stack_on=None, possible_transports=None):
 
2360
    def require_stacking(self, stack_on=None, possible_transports=None,
 
2361
            _skip_repo=False):
2362
2362
        """We have a request to stack, try to ensure the formats support it.
2363
2363
 
2364
2364
        :param stack_on: If supplied, it is the URL to a branch that we want to
2402
2402
            target[:] = [target_branch, True, False]
2403
2403
            return target
2404
2404
 
2405
 
        if not (self.repository_format.supports_external_lookups):
 
2405
        if (not _skip_repo and
 
2406
                 not self.repository_format.supports_external_lookups):
2406
2407
            # We need to upgrade the Repository.
2407
2408
            target_branch, _, do_upgrade = get_target_branch()
2408
2409
            if target_branch is None:
3268
3269
        else:
3269
3270
            remote_repo = None
3270
3271
            policy = None
 
3272
        bzrdir._format.set_branch_format(self.get_branch_format())
 
3273
        if require_stacking:
 
3274
            # The repo has already been created, but we need to make sure that
 
3275
            # we'll make a stackable branch.
 
3276
            bzrdir._format.require_stacking(_skip_repo=True)
3271
3277
        return remote_repo, bzrdir, require_stacking, policy
3272
3278
 
3273
3279
    def _open(self, transport):
3449
3455
            if info.native:
3450
3456
                help = '(native) ' + help
3451
3457
            return ':%s:\n%s\n\n' % (key,
3452
 
                    textwrap.fill(help, initial_indent='    ',
3453
 
                    subsequent_indent='    '))
 
3458
                textwrap.fill(help, initial_indent='    ',
 
3459
                    subsequent_indent='    ',
 
3460
                    break_long_words=False))
3454
3461
        if default_realkey is not None:
3455
3462
            output += wrapped(default_realkey, '(default) %s' % default_help,
3456
3463
                              self.get_info('default'))