/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 bzrlib/missing.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-11 04:02:41 UTC
  • mfrom: (5017.2.2 tariff)
  • Revision ID: pqm@pqm.ubuntu.com-20100211040241-w6n021dz0uus341n
(mbp) add import-tariff tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
from . import (
22
 
    errors,
 
19
from bzrlib import (
23
20
    log,
 
21
    repository as _mod_repository,
 
22
    tsort,
24
23
    )
25
 
 
26
 
 
27
 
def iter_log_revisions(revisions, revision_source, verbose, rev_tag_dict=None):
28
 
    if rev_tag_dict is None:
29
 
        rev_tag_dict = {}
30
 
    for revno, rev_id, merge_depth in revisions:
 
24
import bzrlib.revision as _mod_revision
 
25
 
 
26
 
 
27
def iter_log_revisions(revisions, revision_source, verbose):
 
28
    last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
 
29
    last_rev_id = None
 
30
    for rev in revisions:
 
31
        # We need the following for backward compatibilty (hopefully
 
32
        # this will be deprecated soon :-/) -- vila 080911
 
33
        if len(rev) == 2:
 
34
            revno, rev_id = rev
 
35
            merge_depth = 0
 
36
        else:
 
37
            revno, rev_id, merge_depth = rev
31
38
        rev = revision_source.get_revision(rev_id)
32
39
        if verbose:
33
40
            delta = revision_source.get_revision_delta(rev_id)
34
41
        else:
35
42
            delta = None
36
 
        yield log.LogRevision(rev, revno, merge_depth, delta=delta,
37
 
                              tags=rev_tag_dict.get(rev_id))
 
43
        yield log.LogRevision(rev, revno, merge_depth, delta=delta)
38
44
 
39
45
 
40
46
def find_unmerged(local_branch, remote_branch, restrict='all',
41
 
                  include_merged=None, backward=False,
 
47
                  include_merges=False, backward=False,
42
48
                  local_revid_range=None, remote_revid_range=None):
43
49
    """Find revisions from each side that have not been merged.
44
50
 
49
55
        unique revisions from both sides. If 'local', we will return None
50
56
        for the remote revisions, similarly if 'remote' we will return None for
51
57
        the local revisions.
52
 
    :param include_merged: Show mainline revisions only if False,
 
58
    :param include_merges: Show mainline revisions only if False,
53
59
        all revisions otherwise.
54
60
    :param backward: Show oldest versions first when True, newest versions
55
61
        first when False.
61
67
    :return: A list of [(revno, revision_id)] for the mainline revisions on
62
68
        each side.
63
69
    """
64
 
    if include_merged is None:
65
 
        include_merged = False
66
 
    with local_branch.lock_read(), remote_branch.lock_read():
67
 
        return _find_unmerged(
68
 
            local_branch, remote_branch, restrict=restrict,
69
 
            include_merged=include_merged, backward=backward,
70
 
            local_revid_range=local_revid_range,
71
 
            remote_revid_range=remote_revid_range)
 
70
    local_branch.lock_read()
 
71
    try:
 
72
        remote_branch.lock_read()
 
73
        try:
 
74
            return _find_unmerged(
 
75
                local_branch, remote_branch, restrict=restrict,
 
76
                include_merges=include_merges, backward=backward,
 
77
                local_revid_range=local_revid_range,
 
78
                remote_revid_range=remote_revid_range)
 
79
        finally:
 
80
            remote_branch.unlock()
 
81
    finally:
 
82
        local_branch.unlock()
72
83
 
73
84
 
74
85
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
80
91
    :param tip: The tip of mainline
81
92
    :param backward: Show oldest versions first when True, newest versions
82
93
        first when False.
83
 
    :return: [(revno, revision_id, 0)] for all revisions in ancestry that
 
94
    :return: [(revno, revision_id)] for all revisions in ancestry that
84
95
        are left-hand parents from tip, or None if ancestry is None.
85
96
    """
86
97
    if ancestry is None:
87
98
        return None
88
 
    if not ancestry:  # Empty ancestry, no need to do any work
 
99
    if not ancestry: #Empty ancestry, no need to do any work
89
100
        return []
90
101
 
91
102
    # Optionally, we could make 1 call to graph.get_parent_map with all
99
110
        parent_map = graph.get_parent_map([cur])
100
111
        parents = parent_map.get(cur)
101
112
        if not parents:
102
 
            break  # Ghost, we are done
103
 
        mainline.append(
104
 
            (str(cur_revno) if cur_revno is not None else None, cur, 0))
 
113
            break # Ghost, we are done
 
114
        mainline.append((str(cur_revno), cur))
105
115
        cur = parents[0]
106
 
        if cur_revno is not None:
107
 
            cur_revno -= 1
 
116
        cur_revno -= 1
108
117
    if not backward:
109
118
        mainline.reverse()
110
119
    return mainline
126
135
    """
127
136
    if ancestry is None:
128
137
        return None
129
 
    if not ancestry:  # Empty ancestry, no need to do any work
 
138
    if not ancestry: #Empty ancestry, no need to do any work
130
139
        return []
131
140
 
132
141
    merge_sorted_revisions = branch.iter_merge_sorted_revisions()
149
158
    if revid_range is None or revs is None:
150
159
        return revs
151
160
    return [rev for rev in revs
152
 
            if graph.is_between(rev[1], revid_range[0], revid_range[1])]
 
161
        if graph.is_between(rev[1], revid_range[0], revid_range[1])]
153
162
 
154
163
 
155
164
def _find_unmerged(local_branch, remote_branch, restrict,
156
 
                   include_merged, backward,
 
165
                   include_merges, backward,
157
166
                   local_revid_range=None, remote_revid_range=None):
158
167
    """See find_unmerged.
159
168
 
160
169
    The branches should already be locked before entering.
161
170
    """
162
 
    try:
163
 
        local_revno, local_revision_id = local_branch.last_revision_info()
164
 
    except (errors.UnsupportedOperation, errors.GhostRevisionsHaveNoRevno):
165
 
        local_revno = None
166
 
        local_revision_id = local_branch.last_revision()
167
 
    try:
168
 
        remote_revno, remote_revision_id = remote_branch.last_revision_info()
169
 
    except (errors.UnsupportedOperation, errors.GhostRevisionsHaveNoRevno):
170
 
        remote_revision_id = remote_branch.last_revision()
171
 
        remote_revno = None
172
 
 
173
 
    if local_revision_id == remote_revision_id:
 
171
    local_revno, local_revision_id = local_branch.last_revision_info()
 
172
    remote_revno, remote_revision_id = remote_branch.last_revision_info()
 
173
    if local_revno == remote_revno and local_revision_id == remote_revision_id:
174
174
        # A simple shortcut when the tips are at the same point
175
175
        return [], []
176
176
    graph = local_branch.repository.get_graph(remote_branch.repository)
188
188
                             ' "remote": %r' % (restrict,))
189
189
        local_extra, remote_extra = graph.find_difference(local_revision_id,
190
190
                                                          remote_revision_id)
191
 
    if include_merged:
 
191
    if include_merges:
192
192
        locals = _enumerate_with_merges(local_branch, local_extra,
193
193
                                        graph, local_revno,
194
194
                                        local_revision_id, backward)
202
202
                                     local_revision_id, backward)
203
203
        remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
204
204
                                      remote_revision_id, backward)
205
 
    return _filter_revs(graph, locals, local_revid_range), _filter_revs(
206
 
        graph, remotes, remote_revid_range)
 
205
    return _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
 
206
        remotes, remote_revid_range)
207
207
 
208
208
 
209
209
def sorted_revisions(revisions, history_map):
210
 
    revisions = sorted([(history_map[r], r) for r in revisions])
 
210
    revisions = [(history_map[r],r) for r in revisions]
 
211
    revisions.sort()
211
212
    return revisions