← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

(jelmer) Use the absolute_import feature everywhere in bzrlib,
 and add a source test to make sure it's used everywhere. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
16
16
 
17
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from bzrlib import (
20
22
    log,
21
 
    repository as _mod_repository,
22
 
    tsort,
 
23
    symbol_versioning,
23
24
    )
24
25
import bzrlib.revision as _mod_revision
25
26
 
44
45
 
45
46
 
46
47
def find_unmerged(local_branch, remote_branch, restrict='all',
47
 
                  include_merges=False, backward=False,
48
 
                  local_revid_range=None, remote_revid_range=None):
 
48
                  include_merged=None, backward=False,
 
49
                  local_revid_range=None, remote_revid_range=None,
 
50
                  include_merges=symbol_versioning.DEPRECATED_PARAMETER):
49
51
    """Find revisions from each side that have not been merged.
50
52
 
51
53
    :param local_branch: Compare the history of local_branch
55
57
        unique revisions from both sides. If 'local', we will return None
56
58
        for the remote revisions, similarly if 'remote' we will return None for
57
59
        the local revisions.
58
 
    :param include_merges: Show mainline revisions only if False,
 
60
    :param include_merged: Show mainline revisions only if False,
59
61
        all revisions otherwise.
60
62
    :param backward: Show oldest versions first when True, newest versions
61
63
        first when False.
63
65
        revisions (lower bound, upper bound)
64
66
    :param remote_revid_range: Revision-id range for filtering remote_branch
65
67
        revisions (lower bound, upper bound)
 
68
    :param include_merges: Deprecated historical alias for include_merged
66
69
 
67
70
    :return: A list of [(revno, revision_id)] for the mainline revisions on
68
71
        each side.
69
72
    """
 
73
    if symbol_versioning.deprecated_passed(include_merges):
 
74
        symbol_versioning.warn(
 
75
            'include_merges was deprecated in 2.5.'
 
76
            ' Use include_merged instead.',
 
77
            DeprecationWarning, stacklevel=2)
 
78
        if include_merged is None:
 
79
            include_merged = include_merges
 
80
    if include_merged is None:
 
81
        include_merged = False
70
82
    local_branch.lock_read()
71
83
    try:
72
84
        remote_branch.lock_read()
73
85
        try:
74
86
            return _find_unmerged(
75
87
                local_branch, remote_branch, restrict=restrict,
76
 
                include_merges=include_merges, backward=backward,
 
88
                include_merged=include_merged, backward=backward,
77
89
                local_revid_range=local_revid_range,
78
90
                remote_revid_range=remote_revid_range)
79
91
        finally:
162
174
 
163
175
 
164
176
def _find_unmerged(local_branch, remote_branch, restrict,
165
 
                   include_merges, backward,
 
177
                   include_merged, backward,
166
178
                   local_revid_range=None, remote_revid_range=None):
167
179
    """See find_unmerged.
168
180
 
188
200
                             ' "remote": %r' % (restrict,))
189
201
        local_extra, remote_extra = graph.find_difference(local_revision_id,
190
202
                                                          remote_revision_id)
191
 
    if include_merges:
 
203
    if include_merged:
192
204
        locals = _enumerate_with_merges(local_branch, local_extra,
193
205
                                        graph, local_revno,
194
206
                                        local_revision_id, backward)