← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

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,
 
23
    symbol_versioning,
21
24
    )
22
25
import bzrlib.revision as _mod_revision
23
26
 
42
45
 
43
46
 
44
47
def find_unmerged(local_branch, remote_branch, restrict='all',
45
 
                  include_merges=False, backward=False,
46
 
                  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):
47
51
    """Find revisions from each side that have not been merged.
48
52
 
49
53
    :param local_branch: Compare the history of local_branch
53
57
        unique revisions from both sides. If 'local', we will return None
54
58
        for the remote revisions, similarly if 'remote' we will return None for
55
59
        the local revisions.
56
 
    :param include_merges: Show mainline revisions only if False,
 
60
    :param include_merged: Show mainline revisions only if False,
57
61
        all revisions otherwise.
58
62
    :param backward: Show oldest versions first when True, newest versions
59
63
        first when False.
61
65
        revisions (lower bound, upper bound)
62
66
    :param remote_revid_range: Revision-id range for filtering remote_branch
63
67
        revisions (lower bound, upper bound)
 
68
    :param include_merges: Deprecated historical alias for include_merged
64
69
 
65
70
    :return: A list of [(revno, revision_id)] for the mainline revisions on
66
71
        each side.
67
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
68
82
    local_branch.lock_read()
69
83
    try:
70
84
        remote_branch.lock_read()
71
85
        try:
72
86
            return _find_unmerged(
73
87
                local_branch, remote_branch, restrict=restrict,
74
 
                include_merges=include_merges, backward=backward,
 
88
                include_merged=include_merged, backward=backward,
75
89
                local_revid_range=local_revid_range,
76
90
                remote_revid_range=remote_revid_range)
77
91
        finally:
160
174
 
161
175
 
162
176
def _find_unmerged(local_branch, remote_branch, restrict,
163
 
                   include_merges, backward,
 
177
                   include_merged, backward,
164
178
                   local_revid_range=None, remote_revid_range=None):
165
179
    """See find_unmerged.
166
180
 
186
200
                             ' "remote": %r' % (restrict,))
187
201
        local_extra, remote_extra = graph.find_difference(local_revision_id,
188
202
                                                          remote_revision_id)
189
 
    if include_merges:
 
203
    if include_merged:
190
204
        locals = _enumerate_with_merges(local_branch, local_extra,
191
205
                                        graph, local_revno,
192
206
                                        local_revision_id, backward)