17
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
19
from __future__ import absolute_import
21
repository as _mod_repository,
27
def iter_log_revisions(revisions, revision_source, verbose, rev_tag_dict=None):
28
if rev_tag_dict is None:
30
for revno, rev_id, merge_depth in revisions:
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
31
38
rev = revision_source.get_revision(rev_id)
33
40
delta = revision_source.get_revision_delta(rev_id)
36
yield log.LogRevision(rev, revno, merge_depth, delta=delta,
37
tags=rev_tag_dict.get(rev_id))
43
yield log.LogRevision(rev, revno, merge_depth, delta=delta)
40
46
def find_unmerged(local_branch, remote_branch, restrict='all',
41
include_merged=None, backward=False,
47
include_merges=False, backward=False,
42
48
local_revid_range=None, remote_revid_range=None):
43
49
"""Find revisions from each side that have not been merged.
49
55
unique revisions from both sides. If 'local', we will return None
50
56
for the remote revisions, similarly if 'remote' we will return None for
51
57
the local revisions.
52
:param include_merged: Show mainline revisions only if False,
58
:param include_merges: Show mainline revisions only if False,
53
59
all revisions otherwise.
54
60
:param backward: Show oldest versions first when True, newest versions
61
67
:return: A list of [(revno, revision_id)] for the mainline revisions on
64
if include_merged is None:
65
include_merged = False
66
with local_branch.lock_read(), remote_branch.lock_read():
67
return _find_unmerged(
68
local_branch, remote_branch, restrict=restrict,
69
include_merged=include_merged, backward=backward,
70
local_revid_range=local_revid_range,
71
remote_revid_range=remote_revid_range)
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()
74
85
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
80
91
:param tip: The tip of mainline
81
92
:param backward: Show oldest versions first when True, newest versions
83
:return: [(revno, revision_id, 0)] for all revisions in ancestry that
94
:return: [(revno, revision_id)] for all revisions in ancestry that
84
95
are left-hand parents from tip, or None if ancestry is None.
86
97
if ancestry is None:
88
if not ancestry: # Empty ancestry, no need to do any work
99
if not ancestry: #Empty ancestry, no need to do any work
91
102
# Optionally, we could make 1 call to graph.get_parent_map with all
99
110
parent_map = graph.get_parent_map([cur])
100
111
parents = parent_map.get(cur)
102
break # Ghost, we are done
104
(str(cur_revno) if cur_revno is not None else None, cur, 0))
113
break # Ghost, we are done
114
mainline.append((str(cur_revno), cur))
106
if cur_revno is not None:
109
118
mainline.reverse()
149
158
if revid_range is None or revs is None:
151
160
return [rev for rev in revs
152
if graph.is_between(rev[1], revid_range[0], revid_range[1])]
161
if graph.is_between(rev[1], revid_range[0], revid_range[1])]
155
164
def _find_unmerged(local_branch, remote_branch, restrict,
156
include_merged, backward,
165
include_merges, backward,
157
166
local_revid_range=None, remote_revid_range=None):
158
167
"""See find_unmerged.
160
169
The branches should already be locked before entering.
163
local_revno, local_revision_id = local_branch.last_revision_info()
164
except (errors.UnsupportedOperation, errors.GhostRevisionsHaveNoRevno):
166
local_revision_id = local_branch.last_revision()
168
remote_revno, remote_revision_id = remote_branch.last_revision_info()
169
except (errors.UnsupportedOperation, errors.GhostRevisionsHaveNoRevno):
170
remote_revision_id = remote_branch.last_revision()
173
if local_revision_id == remote_revision_id:
171
local_revno, local_revision_id = local_branch.last_revision_info()
172
remote_revno, remote_revision_id = remote_branch.last_revision_info()
173
if local_revno == remote_revno and local_revision_id == remote_revision_id:
174
174
# A simple shortcut when the tips are at the same point
176
176
graph = local_branch.repository.get_graph(remote_branch.repository)
188
188
' "remote": %r' % (restrict,))
189
189
local_extra, remote_extra = graph.find_difference(local_revision_id,
190
190
remote_revision_id)
192
192
locals = _enumerate_with_merges(local_branch, local_extra,
193
193
graph, local_revno,
194
194
local_revision_id, backward)
202
202
local_revision_id, backward)
203
203
remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
204
204
remote_revision_id, backward)
205
return _filter_revs(graph, locals, local_revid_range), _filter_revs(
206
graph, remotes, remote_revid_range)
205
return _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
206
remotes, remote_revid_range)
209
209
def sorted_revisions(revisions, history_map):
210
revisions = sorted([(history_map[r], r) for r in revisions])
210
revisions = [(history_map[r],r) for r in revisions]