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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-30 19:16:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6639.
  • Revision ID: jelmer@jelmer.uk-20170530191623-t9ls96vjy9wslpoo
Remove deprecated functionality.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
33
33
    bugtracker,
34
34
    bundle,
35
35
    btree_index,
 
36
    cache_utf8,
36
37
    controldir,
37
38
    directory_service,
38
39
    delta,
48
49
    rename_map,
49
50
    revision as _mod_revision,
50
51
    static_tuple,
 
52
    symbol_versioning,
51
53
    timestamp,
52
54
    transport,
53
55
    ui,
81
83
    text_type,
82
84
)
83
85
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
84
 
from . import (
85
 
    symbol_versioning,
86
 
    )
87
86
 
88
87
 
89
88
def _get_branch_location(control_dir, possible_transports=None):
458
457
        try:
459
458
            # TODO: jam 20060112 should cat-revision always output utf-8?
460
459
            if revision_id is not None:
461
 
                revision_id = osutils.safe_revision_id(revision_id, warn=False)
 
460
                revision_id = cache_utf8.encode(revision_id)
462
461
                try:
463
462
                    self.print_revision(revisions, revision_id)
464
463
                except errors.NoSuchRevision:
1444
1443
            use_existing_dir=False, switch=False, bind=False,
1445
1444
            files_from=None):
1446
1445
        from breezy import switch as _mod_switch
1447
 
        from .tag import _merge_tags_if_possible
1448
1446
        if self.invoked_as in ['get', 'clone']:
1449
1447
            ui.ui_factory.show_user_warning(
1450
1448
                'deprecated_command',
1523
1521
                to_repo = to_dir.create_repository()
1524
1522
            to_repo.fetch(br_from.repository, revision_id=revision_id)
1525
1523
            branch = br_from.sprout(to_dir, revision_id=revision_id)
1526
 
        _merge_tags_if_possible(br_from, branch)
 
1524
        br_from.tags.merge_to(branch.tags)
 
1525
 
1527
1526
        # If the source branch is stacked, the new branch may
1528
1527
        # be stacked whether we asked for that explicitly or not.
1529
1528
        # We therefore need a try/except here and not just 'if stacked:'
2744
2743
            match_author=None,
2745
2744
            match_bugs=None,
2746
2745
            omit_merges=False,
2747
 
            include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2748
2746
            ):
2749
2747
        from .log import (
2750
2748
            Logger,
2752
2750
            _get_info_for_log_files,
2753
2751
            )
2754
2752
        direction = (forward and 'forward') or 'reverse'
2755
 
        if symbol_versioning.deprecated_passed(include_merges):
2756
 
            ui.ui_factory.show_user_warning(
2757
 
                'deprecated_command_option',
2758
 
                deprecated_name='--include-merges',
2759
 
                recommended_name='--include-merged',
2760
 
                deprecated_in_version='2.5',
2761
 
                command=self.invoked_as)
2762
 
            if include_merged is None:
2763
 
                include_merged = include_merges
2764
 
            else:
2765
 
                raise errors.BzrCommandError(gettext(
2766
 
                    '{0} and {1} are mutually exclusive').format(
2767
 
                    '--include-merges', '--include-merged'))
2768
2753
        if include_merged is None:
2769
2754
            include_merged = False
2770
2755
        if (exclude_common_ancestry
4540
4525
    def _get_merger_from_branch(self, tree, location, revision, remember,
4541
4526
                                possible_transports, pb):
4542
4527
        """Produce a merger from a location, assuming it refers to a branch."""
4543
 
        from .tag import _merge_tags_if_possible
4544
4528
        # find the branch locations
4545
4529
        other_loc, user_location = self._select_branch_location(tree, location,
4546
4530
            revision, -1)
4580
4564
            tree.branch.set_submit_branch(other_branch.base)
4581
4565
        # Merge tags (but don't set them in the master branch yet, the user
4582
4566
        # might revert this merge).  Commit will propagate them.
4583
 
        _merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
 
4567
        other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
4584
4568
        merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4585
4569
            other_revision_id, base_revision_id, other_branch, base_branch)
4586
4570
        if other_path != '':
4939
4923
            log_format=None, long=False, short=False, line=False,
4940
4924
            show_ids=False, verbose=False, this=False, other=False,
4941
4925
            include_merged=None, revision=None, my_revision=None,
4942
 
            directory=u'.',
4943
 
            include_merges=symbol_versioning.DEPRECATED_PARAMETER):
 
4926
            directory=u'.'):
4944
4927
        from breezy.missing import find_unmerged, iter_log_revisions
4945
4928
        def message(s):
4946
4929
            if not is_quiet():
4947
4930
                self.outf.write(s)
4948
4931
 
4949
 
        if symbol_versioning.deprecated_passed(include_merges):
4950
 
            ui.ui_factory.show_user_warning(
4951
 
                'deprecated_command_option',
4952
 
                deprecated_name='--include-merges',
4953
 
                recommended_name='--include-merged',
4954
 
                deprecated_in_version='2.5',
4955
 
                command=self.invoked_as)
4956
 
            if include_merged is None:
4957
 
                include_merged = include_merges
4958
 
            else:
4959
 
                raise errors.BzrCommandError(gettext(
4960
 
                    '{0} and {1} are mutually exclusive').format(
4961
 
                    '--include-merges', '--include-merged'))
4962
4932
        if include_merged is None:
4963
4933
            include_merged = False
4964
4934
        if this: