/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/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-03-09 21:46:40 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: abentley@panoramicfeedback.com-20070309214640-nnxk7g37bygoz50c
Add (set|get)_public_branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3335
3335
        if patch_type == 'plain':
3336
3336
            patch_type = None
3337
3337
        branch = Branch.open('.')
3338
 
        config_submit_branch = branch.get_submit_branch()
 
3338
        stored_submit_branch = branch.get_submit_branch()
3339
3339
        if submit_branch is None:
3340
 
            submit_branch = config_submit_branch
 
3340
            submit_branch = stored_submit_branch
3341
3341
        else:
3342
 
            if config_submit_branch is None:
 
3342
            if stored_submit_branch is None:
3343
3343
                branch.set_submit_branch(submit_branch)
3344
3344
        if submit_branch is None:
3345
3345
            submit_branch = branch.get_parent()
3346
3346
        if submit_branch is None:
3347
3347
            raise errors.BzrCommandError('No submit branch specified or known')
3348
 
        config_public_branch = branch.get_config().get_user_option(
3349
 
                'public_branch')
 
3348
 
 
3349
        stored_public_branch = branch.get_public_branch()
3350
3350
        if public_branch is None:
3351
 
            public_branch = config_public_branch
3352
 
        elif config_public_branch is None:
3353
 
            branch.get_config().set_user_option('public_branch', public_branch)
 
3351
            public_branch = stored_public_branch
 
3352
        elif stored_public_branch is None:
 
3353
            branch.set_public_branch(public_branch)
3354
3354
        if patch_type != "bundle" and public_branch is None:
3355
3355
            raise errors.BzrCommandError('No public branch specified or'
3356
3356
                                         ' known')