/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/missing.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/missing.py
20
20
 
21
21
from . import (
22
22
    log,
23
 
    symbol_versioning,
24
23
    )
25
24
from . import revision as _mod_revision
26
25
 
50
49
 
51
50
def find_unmerged(local_branch, remote_branch, restrict='all',
52
51
                  include_merged=None, backward=False,
53
 
                  local_revid_range=None, remote_revid_range=None,
54
 
                  include_merges=symbol_versioning.DEPRECATED_PARAMETER):
 
52
                  local_revid_range=None, remote_revid_range=None):
55
53
    """Find revisions from each side that have not been merged.
56
54
 
57
55
    :param local_branch: Compare the history of local_branch
69
67
        revisions (lower bound, upper bound)
70
68
    :param remote_revid_range: Revision-id range for filtering remote_branch
71
69
        revisions (lower bound, upper bound)
72
 
    :param include_merges: Deprecated historical alias for include_merged
73
70
 
74
71
    :return: A list of [(revno, revision_id)] for the mainline revisions on
75
72
        each side.
76
73
    """
77
 
    if symbol_versioning.deprecated_passed(include_merges):
78
 
        symbol_versioning.warn(
79
 
            'include_merges was deprecated in 2.5.'
80
 
            ' Use include_merged instead.',
81
 
            DeprecationWarning, stacklevel=2)
82
 
        if include_merged is None:
83
 
            include_merged = include_merges
84
74
    if include_merged is None:
85
75
        include_merged = False
86
76
    local_branch.lock_read()