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
from __future__ import absolute_import
19
21
from bzrlib import (
21
repository as _mod_repository,
24
25
import bzrlib.revision as _mod_revision
27
def iter_log_revisions(revisions, revision_source, verbose):
28
def iter_log_revisions(revisions, revision_source, verbose, rev_tag_dict=None):
28
29
last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
32
if rev_tag_dict is None:
30
34
for rev in revisions:
31
35
# We need the following for backward compatibilty (hopefully
32
36
# this will be deprecated soon :-/) -- vila 080911
37
41
revno, rev_id, merge_depth = rev
38
42
rev = revision_source.get_revision(rev_id)
40
remote_tree = revision_source.revision_tree(rev_id)
41
parent_rev_id = rev.parent_ids[0]
42
if last_rev_id == parent_rev_id:
43
parent_tree = last_tree
45
parent_tree = revision_source.revision_tree(parent_rev_id)
46
revision_tree = revision_source.revision_tree(rev_id)
48
last_tree = revision_tree
49
delta = revision_tree.changes_from(parent_tree)
44
delta = revision_source.get_revision_delta(rev_id)
52
yield log.LogRevision(rev, revno, merge_depth, delta=delta)
47
yield log.LogRevision(rev, revno, merge_depth, delta=delta,
48
tags=rev_tag_dict.get(rev_id))
55
51
def find_unmerged(local_branch, remote_branch, restrict='all',
56
include_merges=False, backward=False,
57
local_revid_range=None, remote_revid_range=None):
52
include_merged=None, backward=False,
53
local_revid_range=None, remote_revid_range=None,
54
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
58
55
"""Find revisions from each side that have not been merged.
60
57
:param local_branch: Compare the history of local_branch
64
61
unique revisions from both sides. If 'local', we will return None
65
62
for the remote revisions, similarly if 'remote' we will return None for
66
63
the local revisions.
67
:param include_merges: Show mainline revisions only if False,
64
:param include_merged: Show mainline revisions only if False,
68
65
all revisions otherwise.
69
66
:param backward: Show oldest versions first when True, newest versions
72
69
revisions (lower bound, upper bound)
73
70
:param remote_revid_range: Revision-id range for filtering remote_branch
74
71
revisions (lower bound, upper bound)
72
:param include_merges: Deprecated historical alias for include_merged
76
74
: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
79
86
local_branch.lock_read()
81
88
remote_branch.lock_read()
83
90
return _find_unmerged(
84
91
local_branch, remote_branch, restrict=restrict,
85
include_merges=include_merges, backward=backward,
92
include_merged=include_merged, backward=backward,
86
93
local_revid_range=local_revid_range,
87
94
remote_revid_range=remote_revid_range)
99
106
:param tip_revno: The revision number for the tip revision
100
107
:param tip: The tip of mainline
101
108
:param backward: Show oldest versions first when True, newest versions
103
110
:return: [(revno, revision_id)] for all revisions in ancestry that
104
111
are left-hand parents from tip, or None if ancestry is None.
138
145
:param tip_revno: The revision number for the tip revision
139
146
:param tip: The tip of the ancsetry
140
147
:param backward: Show oldest versions first when True, newest versions
142
149
:return: [(revno, revision_id)] for all revisions in ancestry that
143
150
are parents from tip, or None if ancestry is None.
147
154
if not ancestry: #Empty ancestry, no need to do any work
150
mainline_revs, rev_nos, start_rev_id, end_rev_id = log._get_mainline_revs(
151
branch, None, tip_revno)
152
if not mainline_revs:
155
# This asks for all mainline revisions, which is size-of-history and
156
# should be addressed (but currently the only way to get correct
159
# mainline_revisions always includes an extra revision at the
160
# beginning, so don't request it.
161
parent_map = dict(((key, value) for key, value
162
in graph.iter_ancestry(mainline_revs[1:])
163
if value is not None))
164
# filter out ghosts; merge_sort errors on ghosts.
165
# XXX: is this needed here ? -- vila080910
166
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
167
# XXX: what if rev_graph is empty now ? -- vila080910
168
merge_sorted_revisions = tsort.merge_sort(rev_graph, tip,
157
merge_sorted_revisions = branch.iter_merge_sorted_revisions()
171
158
# Now that we got the correct revnos, keep only the relevant
173
160
merge_sorted_revisions = [
174
(s, revid, n, d, e) for s, revid, n, d, e in 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
175
164
if revid in ancestry]
177
166
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
191
180
def _find_unmerged(local_branch, remote_branch, restrict,
192
include_merges, backward,
181
include_merged, backward,
193
182
local_revid_range=None, remote_revid_range=None):
194
183
"""See find_unmerged.
215
204
' "remote": %r' % (restrict,))
216
205
local_extra, remote_extra = graph.find_difference(local_revision_id,
217
206
remote_revision_id)
219
208
locals = _enumerate_with_merges(local_branch, local_extra,
220
209
graph, local_revno,
221
210
local_revision_id, backward)