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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
19
import bzrlib.ui as ui
22
def iter_log_data(revisions, revision_source, verbose):
23
last_tree = revision_source.revision_tree(None)
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)
25
for revno, rev_id in revisions:
31
# We need the following for backward compatibilty (hopefully
32
# this will be deprecated soon :-/) -- vila 080911
37
revno, rev_id, merge_depth = rev
26
38
rev = revision_source.get_revision(rev_id)
28
remote_tree = revision_source.revision_tree(rev_id)
29
parent_rev_id = rev.parent_ids[0]
30
if last_rev_id == parent_rev_id:
31
parent_tree = last_tree
33
parent_tree = revision_source.revision_tree(parent_rev_id)
34
revision_tree = revision_source.revision_tree(rev_id)
36
last_tree = revision_tree
37
delta = revision_tree.changes_from(parent_tree)
40
delta = revision_source.get_revision_delta(rev_id)
40
yield revno, rev, delta
43
def find_unmerged(local_branch, remote_branch):
44
progress = ui.ui_factory.nested_progress_bar()
43
yield log.LogRevision(rev, revno, merge_depth, delta=delta)
46
def find_unmerged(local_branch, remote_branch, restrict='all',
47
include_merges=False, backward=False,
48
local_revid_range=None, remote_revid_range=None):
49
"""Find revisions from each side that have not been merged.
51
:param local_branch: Compare the history of local_branch
52
:param remote_branch: versus the history of remote_branch, and determine
53
mainline revisions which have not been merged.
54
:param restrict: ('all', 'local', 'remote') If 'all', we will return the
55
unique revisions from both sides. If 'local', we will return None
56
for the remote revisions, similarly if 'remote' we will return None for
58
:param include_merges: Show mainline revisions only if False,
59
all revisions otherwise.
60
:param backward: Show oldest versions first when True, newest versions
62
:param local_revid_range: Revision-id range for filtering local_branch
63
revisions (lower bound, upper bound)
64
:param remote_revid_range: Revision-id range for filtering remote_branch
65
revisions (lower bound, upper bound)
67
:return: A list of [(revno, revision_id)] for the mainline revisions on
45
70
local_branch.lock_read()
47
72
remote_branch.lock_read()
49
local_rev_history, local_rev_history_map = \
50
_get_history(local_branch, progress, "local", 0)
51
remote_rev_history, remote_rev_history_map = \
52
_get_history(remote_branch, progress, "remote", 1)
53
result = _shortcut(local_rev_history, remote_rev_history)
54
if result is not None:
55
local_extra, remote_extra = result
56
local_extra = sorted_revisions(local_extra,
57
local_rev_history_map)
58
remote_extra = sorted_revisions(remote_extra,
59
remote_rev_history_map)
60
return local_extra, remote_extra
62
local_ancestry = _get_ancestry(local_branch.repository, progress,
63
"local", 2, local_rev_history)
64
remote_ancestry = _get_ancestry(remote_branch.repository, progress,
65
"remote", 3, remote_rev_history)
66
progress.update('pondering', 4, 5)
67
extras = local_ancestry.symmetric_difference(remote_ancestry)
68
local_extra = extras.intersection(set(local_rev_history))
69
remote_extra = extras.intersection(set(remote_rev_history))
70
local_extra = sorted_revisions(local_extra, local_rev_history_map)
71
remote_extra = sorted_revisions(remote_extra,
72
remote_rev_history_map)
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)
75
80
remote_branch.unlock()
77
82
local_branch.unlock()
79
return (local_extra, remote_extra)
81
def _shortcut(local_rev_history, remote_rev_history):
82
local_history = set(local_rev_history)
83
remote_history = set(remote_rev_history)
84
if len(local_rev_history) == 0:
85
return set(), remote_history
86
elif len(remote_rev_history) == 0:
87
return local_history, set()
88
elif local_rev_history[-1] in remote_history:
89
return set(), _after(remote_rev_history, local_rev_history)
90
elif remote_rev_history[-1] in local_history:
91
return _after(local_rev_history, remote_rev_history), set()
95
def _after(larger_history, smaller_history):
96
return set(larger_history[larger_history.index(smaller_history[-1])+1:])
98
def _get_history(branch, progress, label, step):
99
progress.update('%s history' % label, step, 5)
100
rev_history = branch.revision_history()
101
rev_history_map = dict(
102
[(rev, rev_history.index(rev) + 1)
103
for rev in rev_history])
104
return rev_history, rev_history_map
106
def _get_ancestry(repository, progress, label, step, rev_history):
107
progress.update('%s ancestry' % label, step, 5)
108
if len(rev_history) > 0:
109
ancestry = set(repository.get_ancestry(rev_history[-1]))
85
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
86
"""Enumerate the mainline revisions for these revisions.
88
:param ancestry: A set of revisions that we care about
89
:param graph: A Graph which lets us find the parents for a revision
90
:param tip_revno: The revision number for the tip revision
91
:param tip: The tip of mainline
92
:param backward: Show oldest versions first when True, newest versions
94
:return: [(revno, revision_id)] for all revisions in ancestry that
95
are left-hand parents from tip, or None if ancestry is None.
99
if not ancestry: #Empty ancestry, no need to do any work
102
# Optionally, we could make 1 call to graph.get_parent_map with all
103
# ancestors. However that will often check many more parents than we
104
# actually need, and the Graph is likely to already have the parents cached
108
cur_revno = tip_revno
109
while cur in ancestry:
110
parent_map = graph.get_parent_map([cur])
111
parents = parent_map.get(cur)
113
break # Ghost, we are done
114
mainline.append((str(cur_revno), cur))
122
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
124
"""Enumerate the revisions for the ancestry.
126
:param branch: The branch we care about
127
:param ancestry: A set of revisions that we care about
128
:param graph: A Graph which lets us find the parents for a revision
129
:param tip_revno: The revision number for the tip revision
130
:param tip: The tip of the ancsetry
131
:param backward: Show oldest versions first when True, newest versions
133
:return: [(revno, revision_id)] for all revisions in ancestry that
134
are parents from tip, or None if ancestry is None.
138
if not ancestry: #Empty ancestry, no need to do any work
141
merge_sorted_revisions = branch.iter_merge_sorted_revisions()
142
# Now that we got the correct revnos, keep only the relevant
144
merge_sorted_revisions = [
145
# log.reverse_by_depth expects seq_num to be present, but it is
146
# stripped by iter_merge_sorted_revisions()
147
(0, revid, n, d, e) for revid, n, d, e in merge_sorted_revisions
148
if revid in ancestry]
150
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
152
for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
153
revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
157
def _filter_revs(graph, revs, revid_range):
158
if revid_range is None or revs is None:
160
return [rev for rev in revs
161
if graph.is_between(rev[1], revid_range[0], revid_range[1])]
164
def _find_unmerged(local_branch, remote_branch, restrict,
165
include_merges, backward,
166
local_revid_range=None, remote_revid_range=None):
167
"""See find_unmerged.
169
The branches should already be locked before entering.
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
# A simple shortcut when the tips are at the same point
176
graph = local_branch.repository.get_graph(remote_branch.repository)
177
if restrict == 'remote':
179
remote_extra = graph.find_unique_ancestors(remote_revision_id,
181
elif restrict == 'local':
183
local_extra = graph.find_unique_ancestors(local_revision_id,
184
[remote_revision_id])
186
if restrict != 'all':
187
raise ValueError('param restrict not one of "all", "local",'
188
' "remote": %r' % (restrict,))
189
local_extra, remote_extra = graph.find_difference(local_revision_id,
192
locals = _enumerate_with_merges(local_branch, local_extra,
194
local_revision_id, backward)
195
remotes = _enumerate_with_merges(remote_branch, remote_extra,
197
remote_revision_id, backward)
199
# Now that we have unique ancestors, compute just the mainline, and
200
# generate revnos for them.
201
locals = _enumerate_mainline(local_extra, graph, local_revno,
202
local_revision_id, backward)
203
remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
204
remote_revision_id, backward)
205
return _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
206
remotes, remote_revid_range)
115
209
def sorted_revisions(revisions, history_map):
116
210
revisions = [(history_map[r],r) for r in revisions]
added
removed
bzrlib/missing.py
