/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

merge shallow->stacked tweaks

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
722
722
                    ' have a control directory.  This flag will'
723
723
                    ' allow push to proceed.'),
724
724
        Option('reference',
725
 
            help='Create a shallow branch that refers to another branch '
 
725
            help='Create a stacked branch that refers to another branch '
726
726
                'for the commit history. Only the work not present in the '
727
727
                'referenced branch is included in the branch created.',
728
728
            type=unicode),
729
 
        Option('shallow',
730
 
            help='Create a shallow branch that references the public location '
 
729
        Option('stacked',
 
730
            help='Create a stacked branch that references the public location '
731
731
                'of the parent branch. See --reference for more information.'),
732
732
        ]
733
733
    takes_args = ['location?']
735
735
 
736
736
    def run(self, location=None, remember=False, overwrite=False,
737
737
        create_prefix=False, verbose=False, revision=None,
738
 
        use_existing_dir=False, directory=None, reference=None, shallow=False):
 
738
        use_existing_dir=False, directory=None, reference=None, stacked=False):
739
739
        from bzrlib.push import _show_push_branch
740
740
 
741
741
        # Get the source branch and revision_id
754
754
        # Get the reference branch, if any
755
755
        if reference is not None:
756
756
            reference = urlutils.normalize_url(reference)
757
 
        elif shallow:
 
757
        elif stacked:
758
758
            reference = None
759
759
            parent_url = br_from.get_parent()
760
760
            if parent_url: