13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
19
from __future__ import absolute_import
19
from bzrlib.log import (
25
import bzrlib.revision as _mod_revision
28
def iter_log_revisions(revisions, revision_source, verbose, rev_tag_dict=None):
29
last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
24
def iter_log_revisions(revisions, revision_source, verbose):
25
last_tree = revision_source.revision_tree(None)
32
if rev_tag_dict is None:
35
# We need the following for backward compatibilty (hopefully
36
# this will be deprecated soon :-/) -- vila 080911
41
revno, rev_id, merge_depth = rev
27
for revno, rev_id in revisions:
42
28
rev = revision_source.get_revision(rev_id)
44
delta = revision_source.get_revision_delta(rev_id)
30
remote_tree = revision_source.revision_tree(rev_id)
31
parent_rev_id = rev.parent_ids[0]
32
if last_rev_id == parent_rev_id:
33
parent_tree = last_tree
35
parent_tree = revision_source.revision_tree(parent_rev_id)
36
revision_tree = revision_source.revision_tree(rev_id)
38
last_tree = revision_tree
39
delta = revision_tree.changes_from(parent_tree)
47
yield log.LogRevision(rev, revno, merge_depth, delta=delta,
48
tags=rev_tag_dict.get(rev_id))
51
def find_unmerged(local_branch, remote_branch, restrict='all',
52
include_merged=None, backward=False,
53
local_revid_range=None, remote_revid_range=None,
54
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
42
yield LogRevision(rev, revno, delta=delta)
45
def find_unmerged(local_branch, remote_branch, restrict='all'):
55
46
"""Find revisions from each side that have not been merged.
57
48
:param local_branch: Compare the history of local_branch
61
52
unique revisions from both sides. If 'local', we will return None
62
53
for the remote revisions, similarly if 'remote' we will return None for
63
54
the local revisions.
64
:param include_merged: Show mainline revisions only if False,
65
all revisions otherwise.
66
:param backward: Show oldest versions first when True, newest versions
68
:param local_revid_range: Revision-id range for filtering local_branch
69
revisions (lower bound, upper bound)
70
:param remote_revid_range: Revision-id range for filtering remote_branch
71
revisions (lower bound, upper bound)
72
:param include_merges: Deprecated historical alias for include_merged
74
56
:return: A list of [(revno, revision_id)] for the mainline revisions on
77
if symbol_versioning.deprecated_passed(include_merges):
78
symbol_versioning.warn(
79
'include_merges was deprecated in 2.5.'
80
' Use include_merged instead.',
81
DeprecationWarning, stacklevel=2)
82
if include_merged is None:
83
include_merged = include_merges
84
if include_merged is None:
85
include_merged = False
86
59
local_branch.lock_read()
88
61
remote_branch.lock_read()
90
return _find_unmerged(
91
local_branch, remote_branch, restrict=restrict,
92
include_merged=include_merged, backward=backward,
93
local_revid_range=local_revid_range,
94
remote_revid_range=remote_revid_range)
63
return _find_unmerged(local_branch,
64
remote_branch, restrict=restrict)
96
66
remote_branch.unlock()
98
68
local_branch.unlock()
101
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
71
def _enumerate_mainline(ancestry, graph, tip_revno, tip):
102
72
"""Enumerate the mainline revisions for these revisions.
104
74
:param ancestry: A set of revisions that we care about
105
75
:param graph: A Graph which lets us find the parents for a revision
106
76
:param tip_revno: The revision number for the tip revision
107
77
:param tip: The tip of mainline
108
:param backward: Show oldest versions first when True, newest versions
110
78
:return: [(revno, revision_id)] for all revisions in ancestry that
111
79
are left-hand parents from tip, or None if ancestry is None.
127
95
parents = parent_map.get(cur)
129
97
break # Ghost, we are done
130
mainline.append((str(cur_revno), cur))
98
mainline.append((cur_revno, cur))
138
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
140
"""Enumerate the revisions for the ancestry.
142
:param branch: The branch we care about
143
:param ancestry: A set of revisions that we care about
144
:param graph: A Graph which lets us find the parents for a revision
145
:param tip_revno: The revision number for the tip revision
146
:param tip: The tip of the ancsetry
147
:param backward: Show oldest versions first when True, newest versions
149
:return: [(revno, revision_id)] for all revisions in ancestry that
150
are parents from tip, or None if ancestry is None.
154
if not ancestry: #Empty ancestry, no need to do any work
157
merge_sorted_revisions = branch.iter_merge_sorted_revisions()
158
# Now that we got the correct revnos, keep only the relevant
160
merge_sorted_revisions = [
161
# log.reverse_by_depth expects seq_num to be present, but it is
162
# stripped by iter_merge_sorted_revisions()
163
(0, revid, n, d, e) for revid, n, d, e in merge_sorted_revisions
164
if revid in ancestry]
166
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
168
for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
169
revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
173
def _filter_revs(graph, revs, revid_range):
174
if revid_range is None or revs is None:
176
return [rev for rev in revs
177
if graph.is_between(rev[1], revid_range[0], revid_range[1])]
180
def _find_unmerged(local_branch, remote_branch, restrict,
181
include_merged, backward,
182
local_revid_range=None, remote_revid_range=None):
105
def _find_unmerged(local_branch, remote_branch, restrict):
183
106
"""See find_unmerged.
185
108
The branches should already be locked before entering.
189
112
if local_revno == remote_revno and local_revision_id == remote_revision_id:
190
113
# A simple shortcut when the tips are at the same point
192
graph = local_branch.repository.get_graph(remote_branch.repository)
115
graph = local_branch.repository.get_graph(
116
remote_branch.repository)
193
117
if restrict == 'remote':
194
118
local_extra = None
195
remote_extra = graph.find_unique_ancestors(remote_revision_id,
119
remote_extra = graph.find_unique_ancestors(
120
remote_revision_id, [local_revision_id])
197
121
elif restrict == 'local':
198
122
remote_extra = None
199
local_extra = graph.find_unique_ancestors(local_revision_id,
200
[remote_revision_id])
123
local_extra = graph.find_unique_ancestors(
124
local_revision_id, [remote_revision_id])
202
126
if restrict != 'all':
203
127
raise ValueError('param restrict not one of "all", "local",'
204
128
' "remote": %r' % (restrict,))
205
local_extra, remote_extra = graph.find_difference(local_revision_id,
208
locals = _enumerate_with_merges(local_branch, local_extra,
210
local_revision_id, backward)
211
remotes = _enumerate_with_merges(remote_branch, remote_extra,
213
remote_revision_id, backward)
215
# Now that we have unique ancestors, compute just the mainline, and
216
# generate revnos for them.
217
locals = _enumerate_mainline(local_extra, graph, local_revno,
218
local_revision_id, backward)
219
remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
220
remote_revision_id, backward)
221
return _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
222
remotes, remote_revid_range)
129
local_extra, remote_extra = graph.find_difference(
130
local_revision_id, remote_revision_id)
131
# Now that we have unique ancestors, compute just the mainline, and
132
# generate revnos for them.
133
local_mainline = _enumerate_mainline(local_extra, graph, local_revno,
135
remote_mainline = _enumerate_mainline(remote_extra, graph, remote_revno,
137
return local_mainline, remote_mainline
225
140
def sorted_revisions(revisions, history_map):