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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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
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
45
parent_tree = revision_source.revision_tree(parent_rev_id)
46
revision_tree = revision_source.revision_tree(rev_id)
48
last_tree = revision_tree
49
delta = revision_tree.changes_from(parent_tree)
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,
57
local_revid_range=None, remote_revid_range=None):
58
"""Find revisions from each side that have not been merged.
60
:param local_branch: Compare the history of local_branch
61
:param remote_branch: versus the history of remote_branch, and determine
62
mainline revisions which have not been merged.
63
:param restrict: ('all', 'local', 'remote') If 'all', we will return the
64
unique revisions from both sides. If 'local', we will return None
65
for the remote revisions, similarly if 'remote' we will return None for
67
:param include_merges: Show mainline revisions only if False,
68
all revisions otherwise.
69
:param backward: Show oldest versions first when True, newest versions
72
:return: A list of [(revno, revision_id)] for the mainline revisions on
75
local_branch.lock_read()
77
remote_branch.lock_read()
79
return _find_unmerged(
80
local_branch, remote_branch, restrict=restrict,
81
include_merges=include_merges, backward=backward,
82
local_revid_range=local_revid_range,
83
remote_revid_range= remote_revid_range)
85
remote_branch.unlock()
90
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
91
"""Enumerate the mainline revisions for these revisions.
93
:param ancestry: A set of revisions that we care about
94
:param graph: A Graph which lets us find the parents for a revision
95
:param tip_revno: The revision number for the tip revision
96
:param tip: The tip of mainline
97
:param backward: Show oldest versions first when True, newest versions
99
:return: [(revno, revision_id)] for all revisions in ancestry that
100
are left-hand parents from tip, or None if ancestry is None.
104
if not ancestry: #Empty ancestry, no need to do any work
107
# Optionally, we could make 1 call to graph.get_parent_map with all
108
# ancestors. However that will often check many more parents than we
109
# actually need, and the Graph is likely to already have the parents cached
113
cur_revno = tip_revno
114
while cur in ancestry:
115
parent_map = graph.get_parent_map([cur])
116
parents = parent_map.get(cur)
118
break # Ghost, we are done
119
mainline.append((str(cur_revno), cur))
127
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
129
"""Enumerate the revisions for the ancestry.
131
:param branch: The branch we care about
132
:param ancestry: A set of revisions that we care about
133
:param graph: A Graph which lets us find the parents for a revision
134
:param tip_revno: The revision number for the tip revision
135
:param tip: The tip of the ancsetry
136
:param backward: Show oldest versions first when True, newest versions
138
:return: [(revno, revision_id)] for all revisions in ancestry that
139
are parents from tip, or None if ancestry is None.
143
if not ancestry: #Empty ancestry, no need to do any work
146
mainline_revs, rev_nos, start_rev_id, end_rev_id = log._get_mainline_revs(
147
branch, None, tip_revno)
148
if not mainline_revs:
151
# This asks for all mainline revisions, which is size-of-history and
152
# should be addressed (but currently the only way to get correct
155
# mainline_revisions always includes an extra revision at the
156
# beginning, so don't request it.
157
parent_map = dict(((key, value) for key, value
158
in graph.iter_ancestry(mainline_revs[1:])
159
if value is not None))
160
# filter out ghosts; merge_sort errors on ghosts.
161
# XXX: is this needed here ? -- vila080910
162
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
163
# XXX: what if rev_graph is empty now ? -- vila080910
164
merge_sorted_revisions = tsort.merge_sort(rev_graph, tip,
167
# Now that we got the correct revnos, keep only the relevant
169
merge_sorted_revisions = [
170
(s, revid, n, d, e) for s, revid, n, d, e in merge_sorted_revisions
171
if revid in ancestry]
173
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
175
for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
176
revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
180
def _get_revid_in_range(branch, graph, revid_range, revision_id):
181
"""Force revision_id inside bounds"""
182
if revid_range is not None:
183
revid1, revid2 = revid_range
185
revid1 = revid2 = None
186
print branch.nick, revid_range, branch.revision_id_to_revno(revision_id), revision_id
187
# check if older than lower bound
188
if (revid1 is not None and graph.is_ancestor(revision_id, revid1)
189
and revid1 in branch.revision_history()):
190
# is there a cheaper way to check if a revid is present in a branch?
192
# check if younger than upper bound
193
if (revid2 is not None and graph.is_ancestor(revid2, revision_id)
194
and revid2 in branch.revision_history()):
196
print "--> ", branch.revision_id_to_revno(revision_id), revision_id
197
return branch.revision_id_to_revno(revision_id), revision_id
200
def _find_unmerged(local_branch, remote_branch, restrict,
201
include_merges, backward,
202
local_revid_range=None, remote_revid_range=None):
203
"""See find_unmerged.
205
The branches should already be locked before entering.
207
local_revno, local_revision_id = local_branch.last_revision_info()
208
remote_revno, remote_revision_id = remote_branch.last_revision_info()
209
if local_revno == remote_revno and local_revision_id == remote_revision_id:
210
# A simple shortcut when the tips are at the same point
212
graph = local_branch.repository.get_graph(remote_branch.repository)
214
local_revno, local_revision_id = _get_revid_in_range(local_branch,
215
graph, local_revid_range, local_revision_id)
216
remote_revno, remote_revision_id = _get_revid_in_range(remote_branch,
217
graph, remote_revid_range, remote_revision_id)
218
if restrict == 'remote':
220
remote_extra = graph.find_unique_ancestors(remote_revision_id,
222
elif restrict == 'local':
224
local_extra = graph.find_unique_ancestors(local_revision_id,
225
[remote_revision_id])
227
if restrict != 'all':
228
raise ValueError('param restrict not one of "all", "local",'
229
' "remote": %r' % (restrict,))
230
local_extra, remote_extra = graph.find_difference(local_revision_id,
232
#Todo: filter extra revisions to be in the range
234
locals = _enumerate_with_merges(local_branch, local_extra,
236
local_revision_id, backward)
237
remotes = _enumerate_with_merges(remote_branch, remote_extra,
239
remote_revision_id, backward)
241
# Now that we have unique ancestors, compute just the mainline, and
242
# generate revnos for them.
243
locals = _enumerate_mainline(local_extra, graph, local_revno,
244
local_revision_id, backward)
245
remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
246
remote_revision_id, backward)
247
return locals, remotes
250
def sorted_revisions(revisions, history_map):
251
revisions = [(history_map[r],r) for r in revisions]
added
removed
bzrlib/missing.py
