← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-14 13:56:45 UTC
  • mfrom: (6215 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111014135645-phc3q3y21k2ks0s2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
18
18
 
19
19
from bzrlib import (
20
20
    log,
21
 
    repository as _mod_repository,
22
 
    tsort,
 
21
    symbol_versioning,
23
22
    )
24
23
import bzrlib.revision as _mod_revision
25
24
 
44
43
 
45
44
 
46
45
def find_unmerged(local_branch, remote_branch, restrict='all',
47
 
                  include_merges=False, backward=False,
48
 
                  local_revid_range=None, remote_revid_range=None):
 
46
                  include_merged=None, backward=False,
 
47
                  local_revid_range=None, remote_revid_range=None,
 
48
                  include_merges=symbol_versioning.DEPRECATED_PARAMETER):
49
49
    """Find revisions from each side that have not been merged.
50
50
 
51
51
    :param local_branch: Compare the history of local_branch
55
55
        unique revisions from both sides. If 'local', we will return None
56
56
        for the remote revisions, similarly if 'remote' we will return None for
57
57
        the local revisions.
58
 
    :param include_merges: Show mainline revisions only if False,
 
58
    :param include_merged: Show mainline revisions only if False,
59
59
        all revisions otherwise.
60
60
    :param backward: Show oldest versions first when True, newest versions
61
61
        first when False.
63
63
        revisions (lower bound, upper bound)
64
64
    :param remote_revid_range: Revision-id range for filtering remote_branch
65
65
        revisions (lower bound, upper bound)
 
66
    :param include_merges: Deprecated historical alias for include_merged
66
67
 
67
68
    :return: A list of [(revno, revision_id)] for the mainline revisions on
68
69
        each side.
69
70
    """
 
71
    if symbol_versioning.deprecated_passed(include_merges):
 
72
        symbol_versioning.warn(
 
73
            'include_merges was deprecated in 2.5.'
 
74
            ' Use include_merged instead.',
 
75
            DeprecationWarning, stacklevel=2)
 
76
        if include_merged is None:
 
77
            include_merged = include_merges
 
78
    if include_merged is None:
 
79
        include_merged = False
70
80
    local_branch.lock_read()
71
81
    try:
72
82
        remote_branch.lock_read()
73
83
        try:
74
84
            return _find_unmerged(
75
85
                local_branch, remote_branch, restrict=restrict,
76
 
                include_merges=include_merges, backward=backward,
 
86
                include_merged=include_merged, backward=backward,
77
87
                local_revid_range=local_revid_range,
78
88
                remote_revid_range=remote_revid_range)
79
89
        finally:
138
148
    if not ancestry: #Empty ancestry, no need to do any work
139
149
        return []
140
150
 
141
 
    mainline_revs, rev_nos, start_rev_id, end_rev_id = log._get_mainline_revs(
142
 
        branch, None, tip_revno)
143
 
    if not mainline_revs:
144
 
        return []
145
 
 
146
 
    # This asks for all mainline revisions, which is size-of-history and
147
 
    # should be addressed (but currently the only way to get correct
148
 
    # revnos).
149
 
 
150
 
    # mainline_revisions always includes an extra revision at the
151
 
    # beginning, so don't request it.
152
 
    parent_map = dict(((key, value) for key, value
153
 
                       in graph.iter_ancestry(mainline_revs[1:])
154
 
                       if value is not None))
155
 
    # filter out ghosts; merge_sort errors on ghosts.
156
 
    # XXX: is this needed here ? -- vila080910
157
 
    rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
158
 
    # XXX: what if rev_graph is empty now ? -- vila080910
159
 
    merge_sorted_revisions = tsort.merge_sort(rev_graph, tip,
160
 
                                              mainline_revs,
161
 
                                              generate_revno=True)
 
151
    merge_sorted_revisions = branch.iter_merge_sorted_revisions()
162
152
    # Now that we got the correct revnos, keep only the relevant
163
153
    # revisions.
164
154
    merge_sorted_revisions = [
165
 
        (s, revid, n, d, e) for s, revid, n, d, e in merge_sorted_revisions
 
155
        # log.reverse_by_depth expects seq_num to be present, but it is
 
156
        # stripped by iter_merge_sorted_revisions()
 
157
        (0, revid, n, d, e) for revid, n, d, e in merge_sorted_revisions
166
158
        if revid in ancestry]
167
159
    if not backward:
168
160
        merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
180
172
 
181
173
 
182
174
def _find_unmerged(local_branch, remote_branch, restrict,
183
 
                   include_merges, backward,
 
175
                   include_merged, backward,
184
176
                   local_revid_range=None, remote_revid_range=None):
185
177
    """See find_unmerged.
186
178
 
206
198
                             ' "remote": %r' % (restrict,))
207
199
        local_extra, remote_extra = graph.find_difference(local_revision_id,
208
200
                                                          remote_revision_id)
209
 
    if include_merges:
 
201
    if include_merged:
210
202
        locals = _enumerate_with_merges(local_branch, local_extra,
211
203
                                        graph, local_revno,
212
204
                                        local_revision_id, backward)