25
27
def iter_log_revisions(revisions, revision_source, verbose):
26
28
last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
28
for revno, rev_id in revisions:
31
# We need the following for backward compatibilty (hopefully
32
# this will be deprecated soon :-/) -- vila 080911
37
revno, rev_id, merge_depth = rev
29
38
rev = revision_source.get_revision(rev_id)
31
40
remote_tree = revision_source.revision_tree(rev_id)
40
49
delta = revision_tree.changes_from(parent_tree)
43
yield LogRevision(rev, revno, delta=delta)
46
def find_unmerged(local_branch, remote_branch, restrict='all'):
52
yield log.LogRevision(rev, revno, merge_depth, delta=delta)
55
def find_unmerged(local_branch, remote_branch, restrict='all',
56
include_merges=False, backward=False):
47
57
"""Find revisions from each side that have not been merged.
49
59
:param local_branch: Compare the history of local_branch
62
76
remote_branch.lock_read()
64
return _find_unmerged(local_branch,
65
remote_branch, restrict=restrict)
78
return _find_unmerged(
79
local_branch, remote_branch, restrict=restrict,
80
include_merges=include_merges, backward=backward)
67
82
remote_branch.unlock()
69
84
local_branch.unlock()
72
def _enumerate_mainline(ancestry, graph, tip_revno, tip):
87
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
73
88
"""Enumerate the mainline revisions for these revisions.
75
90
:param ancestry: A set of revisions that we care about
76
91
:param graph: A Graph which lets us find the parents for a revision
77
92
:param tip_revno: The revision number for the tip revision
78
93
:param tip: The tip of mainline
94
:param backward: Show oldest versions first when True, newest versions
79
96
:return: [(revno, revision_id)] for all revisions in ancestry that
80
97
are left-hand parents from tip, or None if ancestry is None.
96
113
parents = parent_map.get(cur)
98
115
break # Ghost, we are done
99
mainline.append((cur_revno, cur))
116
mainline.append((str(cur_revno), cur))
106
def _find_unmerged(local_branch, remote_branch, restrict):
124
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
126
"""Enumerate the revisions for the ancestry.
128
:param branch: The branch we care about
129
:param ancestry: A set of revisions that we care about
130
:param graph: A Graph which lets us find the parents for a revision
131
:param tip_revno: The revision number for the tip revision
132
:param tip: The tip of the ancsetry
133
:param backward: Show oldest versions first when True, newest versions
135
:return: [(revno, revision_id)] for all revisions in ancestry that
136
are parents from tip, or None if ancestry is None.
140
if not ancestry: #Empty ancestry, no need to do any work
143
mainline_revs, rev_nos, start_rev_id, end_rev_id = log._get_mainline_revs(
144
branch, None, tip_revno)
145
if not mainline_revs:
148
# This asks for all mainline revisions, which is size-of-history and
149
# should be addressed (but currently the only way to get correct
152
# mainline_revisions always includes an extra revision at the
153
# beginning, so don't request it.
154
parent_map = dict(((key, value) for key, value
155
in graph.iter_ancestry(mainline_revs[1:])
156
if value is not None))
157
# filter out ghosts; merge_sort errors on ghosts.
158
# XXX: is this needed here ? -- vila080910
159
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
160
# XXX: what if rev_graph is empty now ? -- vila080910
161
merge_sorted_revisions = tsort.merge_sort(rev_graph, tip,
164
# Now that we got the correct revnos, keep only the relevant
166
merge_sorted_revisions = [
167
(s, revid, n, d, e) for s, revid, n, d, e in merge_sorted_revisions
168
if revid in ancestry]
170
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
172
for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
173
revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
177
def _find_unmerged(local_branch, remote_branch, restrict,
178
include_merges, backward):
107
179
"""See find_unmerged.
109
181
The branches should already be locked before entering.
113
185
if local_revno == remote_revno and local_revision_id == remote_revision_id:
114
186
# A simple shortcut when the tips are at the same point
116
graph = local_branch.repository.get_graph(
117
remote_branch.repository)
188
graph = local_branch.repository.get_graph(remote_branch.repository)
118
189
if restrict == 'remote':
119
190
local_extra = None
120
remote_extra = graph.find_unique_ancestors(
121
remote_revision_id, [local_revision_id])
191
remote_extra = graph.find_unique_ancestors(remote_revision_id,
122
193
elif restrict == 'local':
123
194
remote_extra = None
124
local_extra = graph.find_unique_ancestors(
125
local_revision_id, [remote_revision_id])
195
local_extra = graph.find_unique_ancestors(local_revision_id,
196
[remote_revision_id])
127
198
if restrict != 'all':
128
199
raise ValueError('param restrict not one of "all", "local",'
129
200
' "remote": %r' % (restrict,))
130
local_extra, remote_extra = graph.find_difference(
131
local_revision_id, remote_revision_id)
132
# Now that we have unique ancestors, compute just the mainline, and
133
# generate revnos for them.
134
local_mainline = _enumerate_mainline(local_extra, graph, local_revno,
136
remote_mainline = _enumerate_mainline(remote_extra, graph, remote_revno,
138
return local_mainline, remote_mainline
201
local_extra, remote_extra = graph.find_difference(local_revision_id,
204
locals = _enumerate_with_merges(local_branch, local_extra,
206
local_revision_id, backward)
207
remotes = _enumerate_with_merges(remote_branch, remote_extra,
209
remote_revision_id, backward)
211
# Now that we have unique ancestors, compute just the mainline, and
212
# generate revnos for them.
213
locals = _enumerate_mainline(local_extra, graph, local_revno,
214
local_revision_id, backward)
215
remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
216
remote_revision_id, backward)
217
return locals, remotes
141
220
def sorted_revisions(revisions, history_map):
added
removed
bzrlib/missing.py
