/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: Martin Pool
  • Date: 2009-03-13 07:54:48 UTC
  • mfrom: (4144 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4189.
  • Revision ID: mbp@sourcefrog.net-20090313075448-jlz1t7baz7gzipqn
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
37
37
            revno, rev_id, merge_depth = rev
38
38
        rev = revision_source.get_revision(rev_id)
39
39
        if verbose:
40
 
            remote_tree = revision_source.revision_tree(rev_id)
41
 
            parent_rev_id = rev.parent_ids[0]
42
 
            if last_rev_id == parent_rev_id:
43
 
                parent_tree = last_tree
44
 
            else:
45
 
                parent_tree = revision_source.revision_tree(parent_rev_id)
46
 
            revision_tree = revision_source.revision_tree(rev_id)
47
 
            last_rev_id = rev_id
48
 
            last_tree = revision_tree
49
 
            delta = revision_tree.changes_from(parent_tree)
 
40
            delta = revision_source.get_revision_delta(rev_id)
50
41
        else:
51
42
            delta = None
52
43
        yield log.LogRevision(rev, revno, merge_depth, delta=delta)
53
44
 
54
45
 
55
46
def find_unmerged(local_branch, remote_branch, restrict='all',
56
 
                  include_merges=False, backward=False):
 
47
                  include_merges=False, backward=False,
 
48
                  local_revid_range=None, remote_revid_range=None):
57
49
    """Find revisions from each side that have not been merged.
58
50
 
59
51
    :param local_branch: Compare the history of local_branch
66
58
    :param include_merges: Show mainline revisions only if False,
67
59
        all revisions otherwise.
68
60
    :param backward: Show oldest versions first when True, newest versions
69
 
        first when False. 
 
61
        first when False.
 
62
    :param local_revid_range: Revision-id range for filtering local_branch
 
63
        revisions (lower bound, upper bound)
 
64
    :param remote_revid_range: Revision-id range for filtering remote_branch
 
65
        revisions (lower bound, upper bound)
70
66
 
71
67
    :return: A list of [(revno, revision_id)] for the mainline revisions on
72
68
        each side.
77
73
        try:
78
74
            return _find_unmerged(
79
75
                local_branch, remote_branch, restrict=restrict,
80
 
                include_merges=include_merges, backward=backward)
 
76
                include_merges=include_merges, backward=backward,
 
77
                local_revid_range=local_revid_range,
 
78
                remote_revid_range=remote_revid_range)
81
79
        finally:
82
80
            remote_branch.unlock()
83
81
    finally:
92
90
    :param tip_revno: The revision number for the tip revision
93
91
    :param tip: The tip of mainline
94
92
    :param backward: Show oldest versions first when True, newest versions
95
 
        first when False. 
 
93
        first when False.
96
94
    :return: [(revno, revision_id)] for all revisions in ancestry that
97
95
        are left-hand parents from tip, or None if ancestry is None.
98
96
    """
131
129
    :param tip_revno: The revision number for the tip revision
132
130
    :param tip: The tip of the ancsetry
133
131
    :param backward: Show oldest versions first when True, newest versions
134
 
        first when False. 
 
132
        first when False.
135
133
    :return: [(revno, revision_id)] for all revisions in ancestry that
136
134
        are parents from tip, or None if ancestry is None.
137
135
    """
154
152
    parent_map = dict(((key, value) for key, value
155
153
                       in graph.iter_ancestry(mainline_revs[1:])
156
154
                       if value is not None))
157
 
    # filter out ghosts; merge_sort errors on ghosts. 
 
155
    # filter out ghosts; merge_sort errors on ghosts.
158
156
    # XXX: is this needed here ? -- vila080910
159
157
    rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
160
158
    # XXX: what if rev_graph is empty now ? -- vila080910
174
172
    return revline
175
173
 
176
174
 
 
175
def _filter_revs(graph, revs, revid_range):
 
176
    if revid_range is None or revs is None:
 
177
        return revs
 
178
    return [rev for rev in revs
 
179
        if graph.is_between(rev[1], revid_range[0], revid_range[1])]
 
180
 
 
181
 
177
182
def _find_unmerged(local_branch, remote_branch, restrict,
178
 
                   include_merges, backward):
 
183
                   include_merges, backward,
 
184
                   local_revid_range=None, remote_revid_range=None):
179
185
    """See find_unmerged.
180
186
 
181
187
    The branches should already be locked before entering.
214
220
                                     local_revision_id, backward)
215
221
        remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
216
222
                                      remote_revision_id, backward)
217
 
    return locals, remotes
 
223
    return _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
 
224
        remotes, remote_revid_range)
218
225
 
219
226
 
220
227
def sorted_revisions(revisions, history_map):