1
# Copyright (C) 2005, 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
21
repository as _mod_repository,
24
import bzrlib.revision as _mod_revision
27
def iter_log_revisions(revisions, revision_source, verbose):
28
last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
31
# We need the following for backward compatibilty (hopefully
32
# this will be deprecated soon :-/) -- vila 080911
37
revno, rev_id, merge_depth = rev
38
rev = revision_source.get_revision(rev_id)
40
delta = revision_source.get_revision_delta(rev_id)
43
yield log.LogRevision(rev, revno, merge_depth, delta=delta)
46
def find_unmerged(local_branch, remote_branch, restrict='all',
47
include_merges=False, backward=False,
48
local_revid_range=None, remote_revid_range=None):
49
"""Find revisions from each side that have not been merged.
51
:param local_branch: Compare the history of local_branch
52
:param remote_branch: versus the history of remote_branch, and determine
53
mainline revisions which have not been merged.
54
:param restrict: ('all', 'local', 'remote') If 'all', we will return the
55
unique revisions from both sides. If 'local', we will return None
56
for the remote revisions, similarly if 'remote' we will return None for
58
:param include_merges: Show mainline revisions only if False,
59
all revisions otherwise.
60
:param backward: Show oldest versions first when True, newest versions
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)
67
:return: A list of [(revno, revision_id)] for the mainline revisions on
70
local_branch.lock_read()
72
remote_branch.lock_read()
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)
80
remote_branch.unlock()
85
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
86
"""Enumerate the mainline revisions for these revisions.
88
:param ancestry: A set of revisions that we care about
89
:param graph: A Graph which lets us find the parents for a revision
90
:param tip_revno: The revision number for the tip revision
91
:param tip: The tip of mainline
92
:param backward: Show oldest versions first when True, newest versions
94
:return: [(revno, revision_id)] for all revisions in ancestry that
95
are left-hand parents from tip, or None if ancestry is None.
99
if not ancestry: #Empty ancestry, no need to do any work
102
# Optionally, we could make 1 call to graph.get_parent_map with all
103
# ancestors. However that will often check many more parents than we
104
# actually need, and the Graph is likely to already have the parents cached
108
cur_revno = tip_revno
109
while cur in ancestry:
110
parent_map = graph.get_parent_map([cur])
111
parents = parent_map.get(cur)
113
break # Ghost, we are done
114
mainline.append((str(cur_revno), cur))
122
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
124
"""Enumerate the revisions for the ancestry.
126
:param branch: The branch we care about
127
:param ancestry: A set of revisions that we care about
128
:param graph: A Graph which lets us find the parents for a revision
129
:param tip_revno: The revision number for the tip revision
130
:param tip: The tip of the ancsetry
131
:param backward: Show oldest versions first when True, newest versions
133
:return: [(revno, revision_id)] for all revisions in ancestry that
134
are parents from tip, or None if ancestry is None.
138
if not ancestry: #Empty ancestry, no need to do any work
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:
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
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,
162
# Now that we got the correct revnos, keep only the relevant
164
merge_sorted_revisions = [
165
(s, revid, n, d, e) for s, revid, n, d, e in merge_sorted_revisions
166
if revid in ancestry]
168
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
170
for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
171
revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
175
def _filter_revs(graph, revs, revid_range):
176
if revid_range is None or revs is None:
178
return [rev for rev in revs
179
if graph.is_between(rev[1], revid_range[0], revid_range[1])]
182
def _find_unmerged(local_branch, remote_branch, restrict,
183
include_merges, backward,
184
local_revid_range=None, remote_revid_range=None):
185
"""See find_unmerged.
187
The branches should already be locked before entering.
189
local_revno, local_revision_id = local_branch.last_revision_info()
190
remote_revno, remote_revision_id = remote_branch.last_revision_info()
191
if local_revno == remote_revno and local_revision_id == remote_revision_id:
192
# A simple shortcut when the tips are at the same point
194
graph = local_branch.repository.get_graph(remote_branch.repository)
195
if restrict == 'remote':
197
remote_extra = graph.find_unique_ancestors(remote_revision_id,
199
elif restrict == 'local':
201
local_extra = graph.find_unique_ancestors(local_revision_id,
202
[remote_revision_id])
204
if restrict != 'all':
205
raise ValueError('param restrict not one of "all", "local",'
206
' "remote": %r' % (restrict,))
207
local_extra, remote_extra = graph.find_difference(local_revision_id,
210
locals = _enumerate_with_merges(local_branch, local_extra,
212
local_revision_id, backward)
213
remotes = _enumerate_with_merges(remote_branch, remote_extra,
215
remote_revision_id, backward)
217
# Now that we have unique ancestors, compute just the mainline, and
218
# generate revnos for them.
219
locals = _enumerate_mainline(local_extra, graph, local_revno,
220
local_revision_id, backward)
221
remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
222
remote_revision_id, backward)
223
return _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
224
remotes, remote_revid_range)
227
def sorted_revisions(revisions, history_map):
228
revisions = [(history_map[r],r) for r in revisions]
added
removed
bzrlib/missing.py
