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
1
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
22
import bzrlib.revision as _mod_revision
25
def iter_log_revisions(revisions, revision_source, verbose):
26
last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
6
def iter_log_data(revisions, revision_source, verbose):
7
from bzrlib.diff import compare_trees
8
from bzrlib.tree import EmptyTree
29
# We need the following for backward compatibilty (hopefully
30
# this will be deprecated soon :-/) -- vila 080911
35
revno, rev_id, merge_depth = rev
11
for revno, rev_id in revisions:
36
12
rev = revision_source.get_revision(rev_id)
38
delta = revision_source.get_revision_delta(rev_id)
14
remote_tree = revision_source.revision_tree(rev_id)
15
parent_rev_id = rev.parent_ids[0]
16
if last_rev_id == parent_rev_id:
17
parent_tree = last_tree
19
parent_tree = revision_source.revision_tree(parent_rev_id)
20
revision_tree = revision_source.revision_tree(rev_id)
22
last_tree = revision_tree
23
delta = compare_trees(revision_tree, parent_tree)
41
yield log.LogRevision(rev, revno, merge_depth, delta=delta)
44
def find_unmerged(local_branch, remote_branch, restrict='all',
45
include_merges=False, backward=False,
46
local_revid_range=None, remote_revid_range=None):
47
"""Find revisions from each side that have not been merged.
49
:param local_branch: Compare the history of local_branch
50
:param remote_branch: versus the history of remote_branch, and determine
51
mainline revisions which have not been merged.
52
:param restrict: ('all', 'local', 'remote') If 'all', we will return the
53
unique revisions from both sides. If 'local', we will return None
54
for the remote revisions, similarly if 'remote' we will return None for
56
:param include_merges: Show mainline revisions only if False,
57
all revisions otherwise.
58
:param backward: Show oldest versions first when True, newest versions
60
:param local_revid_range: Revision-id range for filtering local_branch
61
revisions (lower bound, upper bound)
62
:param remote_revid_range: Revision-id range for filtering remote_branch
63
revisions (lower bound, upper bound)
65
:return: A list of [(revno, revision_id)] for the mainline revisions on
26
yield revno, rev, delta
29
def find_unmerged(local_branch, remote_branch):
30
progress = ui.ui_factory.nested_progress_bar()
68
31
local_branch.lock_read()
70
33
remote_branch.lock_read()
72
return _find_unmerged(
73
local_branch, remote_branch, restrict=restrict,
74
include_merges=include_merges, backward=backward,
75
local_revid_range=local_revid_range,
76
remote_revid_range=remote_revid_range)
35
local_rev_history, local_rev_history_map = \
36
_get_history(local_branch, progress, "local", 0)
37
remote_rev_history, remote_rev_history_map = \
38
_get_history(remote_branch, progress, "remote", 1)
39
result = _shortcut(local_rev_history, remote_rev_history)
40
if result is not None:
41
local_extra, remote_extra = result
42
local_extra = sorted_revisions(local_extra,
43
local_rev_history_map)
44
remote_extra = sorted_revisions(remote_extra,
45
remote_rev_history_map)
46
return local_extra, remote_extra
48
local_ancestry = _get_ancestry(local_branch.repository, progress,
49
"local", 2, local_rev_history)
50
remote_ancestry = _get_ancestry(remote_branch.repository, progress,
51
"remote", 3, remote_rev_history)
52
progress.update('pondering', 4, 5)
53
extras = local_ancestry.symmetric_difference(remote_ancestry)
54
local_extra = extras.intersection(set(local_rev_history))
55
remote_extra = extras.intersection(set(remote_rev_history))
56
local_extra = sorted_revisions(local_extra, local_rev_history_map)
57
remote_extra = sorted_revisions(remote_extra,
58
remote_rev_history_map)
78
61
remote_branch.unlock()
80
63
local_branch.unlock()
83
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
84
"""Enumerate the mainline revisions for these revisions.
86
:param ancestry: A set of revisions that we care about
87
:param graph: A Graph which lets us find the parents for a revision
88
:param tip_revno: The revision number for the tip revision
89
:param tip: The tip of mainline
90
:param backward: Show oldest versions first when True, newest versions
92
:return: [(revno, revision_id)] for all revisions in ancestry that
93
are left-hand parents from tip, or None if ancestry is None.
97
if not ancestry: #Empty ancestry, no need to do any work
100
# Optionally, we could make 1 call to graph.get_parent_map with all
101
# ancestors. However that will often check many more parents than we
102
# actually need, and the Graph is likely to already have the parents cached
106
cur_revno = tip_revno
107
while cur in ancestry:
108
parent_map = graph.get_parent_map([cur])
109
parents = parent_map.get(cur)
111
break # Ghost, we are done
112
mainline.append((str(cur_revno), cur))
120
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
122
"""Enumerate the revisions for the ancestry.
124
:param branch: The branch we care about
125
:param ancestry: A set of revisions that we care about
126
:param graph: A Graph which lets us find the parents for a revision
127
:param tip_revno: The revision number for the tip revision
128
:param tip: The tip of the ancsetry
129
:param backward: Show oldest versions first when True, newest versions
131
:return: [(revno, revision_id)] for all revisions in ancestry that
132
are parents from tip, or None if ancestry is None.
136
if not ancestry: #Empty ancestry, no need to do any work
139
merge_sorted_revisions = branch.iter_merge_sorted_revisions()
140
# Now that we got the correct revnos, keep only the relevant
142
merge_sorted_revisions = [
143
# log.reverse_by_depth expects seq_num to be present, but it is
144
# stripped by iter_merge_sorted_revisions()
145
(0, revid, n, d, e) for revid, n, d, e in merge_sorted_revisions
146
if revid in ancestry]
148
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
150
for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
151
revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
155
def _filter_revs(graph, revs, revid_range):
156
if revid_range is None or revs is None:
158
return [rev for rev in revs
159
if graph.is_between(rev[1], revid_range[0], revid_range[1])]
162
def _find_unmerged(local_branch, remote_branch, restrict,
163
include_merges, backward,
164
local_revid_range=None, remote_revid_range=None):
165
"""See find_unmerged.
167
The branches should already be locked before entering.
169
local_revno, local_revision_id = local_branch.last_revision_info()
170
remote_revno, remote_revision_id = remote_branch.last_revision_info()
171
if local_revno == remote_revno and local_revision_id == remote_revision_id:
172
# A simple shortcut when the tips are at the same point
174
graph = local_branch.repository.get_graph(remote_branch.repository)
175
if restrict == 'remote':
177
remote_extra = graph.find_unique_ancestors(remote_revision_id,
179
elif restrict == 'local':
181
local_extra = graph.find_unique_ancestors(local_revision_id,
182
[remote_revision_id])
184
if restrict != 'all':
185
raise ValueError('param restrict not one of "all", "local",'
186
' "remote": %r' % (restrict,))
187
local_extra, remote_extra = graph.find_difference(local_revision_id,
190
locals = _enumerate_with_merges(local_branch, local_extra,
192
local_revision_id, backward)
193
remotes = _enumerate_with_merges(remote_branch, remote_extra,
195
remote_revision_id, backward)
197
# Now that we have unique ancestors, compute just the mainline, and
198
# generate revnos for them.
199
locals = _enumerate_mainline(local_extra, graph, local_revno,
200
local_revision_id, backward)
201
remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
202
remote_revision_id, backward)
203
return _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
204
remotes, remote_revid_range)
65
return (local_extra, remote_extra)
67
def _shortcut(local_rev_history, remote_rev_history):
68
local_history = set(local_rev_history)
69
remote_history = set(remote_rev_history)
70
if len(local_rev_history) == 0:
71
return set(), remote_history
72
elif len(remote_rev_history) == 0:
73
return local_history, set()
74
elif local_rev_history[-1] in remote_history:
75
return set(), _after(remote_rev_history, local_rev_history)
76
elif remote_rev_history[-1] in local_history:
77
return _after(local_rev_history, remote_rev_history), set()
81
def _after(larger_history, smaller_history):
82
return set(larger_history[larger_history.index(smaller_history[-1])+1:])
84
def _get_history(branch, progress, label, step):
85
progress.update('%s history' % label, step, 5)
86
rev_history = branch.revision_history()
87
rev_history_map = dict(
88
[(rev, rev_history.index(rev) + 1)
89
for rev in rev_history])
90
return rev_history, rev_history_map
92
def _get_ancestry(repository, progress, label, step, rev_history):
93
progress.update('%s ancestry' % label, step, 5)
94
if len(rev_history) > 0:
95
ancestry = set(repository.get_ancestry(rev_history[-1]))
207
101
def sorted_revisions(revisions, history_map):
208
102
revisions = [(history_map[r],r) for r in revisions]
added
removed
bzrlib/missing.py
