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
1
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
6
def iter_log_data(revisions, revision_source, verbose):
7
last_tree = revision_source.revision_tree(None)
19
from __future__ import absolute_import
25
import bzrlib.revision as _mod_revision
28
def iter_log_revisions(revisions, revision_source, verbose):
29
last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
9
for revno, rev_id in revisions:
32
# We need the following for backward compatibilty (hopefully
33
# this will be deprecated soon :-/) -- vila 080911
38
revno, rev_id, merge_depth = rev
10
39
rev = revision_source.get_revision(rev_id)
12
remote_tree = revision_source.revision_tree(rev_id)
13
parent_rev_id = rev.parent_ids[0]
14
if last_rev_id == parent_rev_id:
15
parent_tree = last_tree
17
parent_tree = revision_source.revision_tree(parent_rev_id)
18
revision_tree = revision_source.revision_tree(rev_id)
20
last_tree = revision_tree
21
delta = parent_tree.changes_from(revision_tree)
41
delta = revision_source.get_revision_delta(rev_id)
24
yield revno, rev, delta
27
def find_unmerged(local_branch, remote_branch):
28
progress = ui.ui_factory.nested_progress_bar()
44
yield log.LogRevision(rev, revno, merge_depth, delta=delta)
47
def find_unmerged(local_branch, remote_branch, restrict='all',
48
include_merged=None, backward=False,
49
local_revid_range=None, remote_revid_range=None,
50
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
51
"""Find revisions from each side that have not been merged.
53
:param local_branch: Compare the history of local_branch
54
:param remote_branch: versus the history of remote_branch, and determine
55
mainline revisions which have not been merged.
56
:param restrict: ('all', 'local', 'remote') If 'all', we will return the
57
unique revisions from both sides. If 'local', we will return None
58
for the remote revisions, similarly if 'remote' we will return None for
60
:param include_merged: Show mainline revisions only if False,
61
all revisions otherwise.
62
:param backward: Show oldest versions first when True, newest versions
64
:param local_revid_range: Revision-id range for filtering local_branch
65
revisions (lower bound, upper bound)
66
:param remote_revid_range: Revision-id range for filtering remote_branch
67
revisions (lower bound, upper bound)
68
:param include_merges: Deprecated historical alias for include_merged
70
:return: A list of [(revno, revision_id)] for the mainline revisions on
73
if symbol_versioning.deprecated_passed(include_merges):
74
symbol_versioning.warn(
75
'include_merges was deprecated in 2.5.'
76
' Use include_merged instead.',
77
DeprecationWarning, stacklevel=2)
78
if include_merged is None:
79
include_merged = include_merges
80
if include_merged is None:
81
include_merged = False
29
82
local_branch.lock_read()
31
84
remote_branch.lock_read()
33
local_rev_history, local_rev_history_map = \
34
_get_history(local_branch, progress, "local", 0)
35
remote_rev_history, remote_rev_history_map = \
36
_get_history(remote_branch, progress, "remote", 1)
37
result = _shortcut(local_rev_history, remote_rev_history)
38
if result is not None:
39
local_extra, remote_extra = result
40
local_extra = sorted_revisions(local_extra,
41
local_rev_history_map)
42
remote_extra = sorted_revisions(remote_extra,
43
remote_rev_history_map)
44
return local_extra, remote_extra
46
local_ancestry = _get_ancestry(local_branch.repository, progress,
47
"local", 2, local_rev_history)
48
remote_ancestry = _get_ancestry(remote_branch.repository, progress,
49
"remote", 3, remote_rev_history)
50
progress.update('pondering', 4, 5)
51
extras = local_ancestry.symmetric_difference(remote_ancestry)
52
local_extra = extras.intersection(set(local_rev_history))
53
remote_extra = extras.intersection(set(remote_rev_history))
54
local_extra = sorted_revisions(local_extra, local_rev_history_map)
55
remote_extra = sorted_revisions(remote_extra,
56
remote_rev_history_map)
86
return _find_unmerged(
87
local_branch, remote_branch, restrict=restrict,
88
include_merged=include_merged, backward=backward,
89
local_revid_range=local_revid_range,
90
remote_revid_range=remote_revid_range)
59
92
remote_branch.unlock()
61
94
local_branch.unlock()
63
return (local_extra, remote_extra)
65
def _shortcut(local_rev_history, remote_rev_history):
66
local_history = set(local_rev_history)
67
remote_history = set(remote_rev_history)
68
if len(local_rev_history) == 0:
69
return set(), remote_history
70
elif len(remote_rev_history) == 0:
71
return local_history, set()
72
elif local_rev_history[-1] in remote_history:
73
return set(), _after(remote_rev_history, local_rev_history)
74
elif remote_rev_history[-1] in local_history:
75
return _after(local_rev_history, remote_rev_history), set()
79
def _after(larger_history, smaller_history):
80
return set(larger_history[larger_history.index(smaller_history[-1])+1:])
82
def _get_history(branch, progress, label, step):
83
progress.update('%s history' % label, step, 5)
84
rev_history = branch.revision_history()
85
rev_history_map = dict(
86
[(rev, rev_history.index(rev) + 1)
87
for rev in rev_history])
88
return rev_history, rev_history_map
90
def _get_ancestry(repository, progress, label, step, rev_history):
91
progress.update('%s ancestry' % label, step, 5)
92
if len(rev_history) > 0:
93
ancestry = set(repository.get_ancestry(rev_history[-1]))
97
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
98
"""Enumerate the mainline revisions for these revisions.
100
:param ancestry: A set of revisions that we care about
101
:param graph: A Graph which lets us find the parents for a revision
102
:param tip_revno: The revision number for the tip revision
103
:param tip: The tip of mainline
104
:param backward: Show oldest versions first when True, newest versions
106
:return: [(revno, revision_id)] for all revisions in ancestry that
107
are left-hand parents from tip, or None if ancestry is None.
111
if not ancestry: #Empty ancestry, no need to do any work
114
# Optionally, we could make 1 call to graph.get_parent_map with all
115
# ancestors. However that will often check many more parents than we
116
# actually need, and the Graph is likely to already have the parents cached
120
cur_revno = tip_revno
121
while cur in ancestry:
122
parent_map = graph.get_parent_map([cur])
123
parents = parent_map.get(cur)
125
break # Ghost, we are done
126
mainline.append((str(cur_revno), cur))
134
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
136
"""Enumerate the revisions for the ancestry.
138
:param branch: The branch we care about
139
:param ancestry: A set of revisions that we care about
140
:param graph: A Graph which lets us find the parents for a revision
141
:param tip_revno: The revision number for the tip revision
142
:param tip: The tip of the ancsetry
143
:param backward: Show oldest versions first when True, newest versions
145
:return: [(revno, revision_id)] for all revisions in ancestry that
146
are parents from tip, or None if ancestry is None.
150
if not ancestry: #Empty ancestry, no need to do any work
153
merge_sorted_revisions = branch.iter_merge_sorted_revisions()
154
# Now that we got the correct revnos, keep only the relevant
156
merge_sorted_revisions = [
157
# log.reverse_by_depth expects seq_num to be present, but it is
158
# stripped by iter_merge_sorted_revisions()
159
(0, revid, n, d, e) for revid, n, d, e in merge_sorted_revisions
160
if revid in ancestry]
162
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
164
for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
165
revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
169
def _filter_revs(graph, revs, revid_range):
170
if revid_range is None or revs is None:
172
return [rev for rev in revs
173
if graph.is_between(rev[1], revid_range[0], revid_range[1])]
176
def _find_unmerged(local_branch, remote_branch, restrict,
177
include_merged, backward,
178
local_revid_range=None, remote_revid_range=None):
179
"""See find_unmerged.
181
The branches should already be locked before entering.
183
local_revno, local_revision_id = local_branch.last_revision_info()
184
remote_revno, remote_revision_id = remote_branch.last_revision_info()
185
if local_revno == remote_revno and local_revision_id == remote_revision_id:
186
# A simple shortcut when the tips are at the same point
188
graph = local_branch.repository.get_graph(remote_branch.repository)
189
if restrict == 'remote':
191
remote_extra = graph.find_unique_ancestors(remote_revision_id,
193
elif restrict == 'local':
195
local_extra = graph.find_unique_ancestors(local_revision_id,
196
[remote_revision_id])
198
if restrict != 'all':
199
raise ValueError('param restrict not one of "all", "local",'
200
' "remote": %r' % (restrict,))
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 _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
218
remotes, remote_revid_range)
99
221
def sorted_revisions(revisions, history_map):
100
222
revisions = [(history_map[r],r) for r in revisions]
added
removed
bzrlib/missing.py
