← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-03 10:06:19 UTC
  • mfrom: (4999.3.2 apport)
  • Revision ID: pqm@pqm.ubuntu.com-20100203100619-f76bo5y5bd5c14wk
(mbp) use apport to send bugs, not just store them

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