← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Martin Pool
  • Date: 2009-08-04 11:40:59 UTC
  • mfrom: (4584 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4586.
  • Revision ID: mbp@sourcefrog.net-20090804114059-xptutagbs5jev3ry
merge trunk

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
3270
3269
        else:
3271
3270
            remote_repo = None
3272
3271
            policy = None
 
3272
        bzrdir._format.set_branch_format(self.get_branch_format())
3273
3273
        if require_stacking:
3274
3274
            # The repo has already been created, but we need to make sure that
3275
3275
            # we'll make a stackable branch.
3455
3455
            if info.native:
3456
3456
                help = '(native) ' + help
3457
3457
            return ':%s:\n%s\n\n' % (key,
3458
 
                    textwrap.fill(help, initial_indent='    ',
3459
 
                    subsequent_indent='    '))
 
3458
                textwrap.fill(help, initial_indent='    ',
 
3459
                    subsequent_indent='    ',
 
3460
                    break_long_words=False))
3460
3461
        if default_realkey is not None:
3461
3462
            output += wrapped(default_realkey, '(default) %s' % default_help,
3462
3463
                              self.get_info('default'))