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
19
from bzrlib import (
21
repository as _mod_repository,
23
24
import bzrlib.revision as _mod_revision
36
37
revno, rev_id, merge_depth = rev
37
38
rev = revision_source.get_revision(rev_id)
39
delta = revision_source.get_revision_delta(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)
42
52
yield log.LogRevision(rev, revno, merge_depth, delta=delta)
45
55
def find_unmerged(local_branch, remote_branch, restrict='all',
46
include_merged=None, backward=False,
47
local_revid_range=None, remote_revid_range=None,
48
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
56
include_merges=False, backward=False):
49
57
"""Find revisions from each side that have not been merged.
51
59
:param local_branch: Compare the history of local_branch
55
63
unique revisions from both sides. If 'local', we will return None
56
64
for the remote revisions, similarly if 'remote' we will return None for
57
65
the local revisions.
58
:param include_merged: Show mainline revisions only if False,
66
:param include_merges: Show mainline revisions only if False,
59
67
all revisions otherwise.
60
68
: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)
66
:param include_merges: Deprecated historical alias for include_merged
68
71
:return: A list of [(revno, revision_id)] for the mainline revisions on
71
if symbol_versioning.deprecated_passed(include_merges):
72
symbol_versioning.warn(
73
'include_merges was deprecated in 2.5.'
74
' Use include_merged instead.',
75
DeprecationWarning, stacklevel=2)
76
if include_merged is None:
77
include_merged = include_merges
78
if include_merged is None:
79
include_merged = False
80
74
local_branch.lock_read()
82
76
remote_branch.lock_read()
84
78
return _find_unmerged(
85
79
local_branch, remote_branch, restrict=restrict,
86
include_merged=include_merged, backward=backward,
87
local_revid_range=local_revid_range,
88
remote_revid_range=remote_revid_range)
80
include_merges=include_merges, backward=backward)
90
82
remote_branch.unlock()
100
92
:param tip_revno: The revision number for the tip revision
101
93
:param tip: The tip of mainline
102
94
:param backward: Show oldest versions first when True, newest versions
104
96
:return: [(revno, revision_id)] for all revisions in ancestry that
105
97
are left-hand parents from tip, or None if ancestry is None.
139
131
:param tip_revno: The revision number for the tip revision
140
132
:param tip: The tip of the ancsetry
141
133
:param backward: Show oldest versions first when True, newest versions
143
135
:return: [(revno, revision_id)] for all revisions in ancestry that
144
136
are parents from tip, or None if ancestry is None.
148
140
if not ancestry: #Empty ancestry, no need to do any work
151
merge_sorted_revisions = branch.iter_merge_sorted_revisions()
143
mainline_revs, rev_nos, start_rev_id, end_rev_id = log._get_mainline_revs(
144
branch, None, tip_revno)
145
if not mainline_revs:
148
# This asks for all mainline revisions, which is size-of-history and
149
# should be addressed (but currently the only way to get correct
152
# mainline_revisions always includes an extra revision at the
153
# beginning, so don't request it.
154
parent_map = dict(((key, value) for key, value
155
in graph.iter_ancestry(mainline_revs[1:])
156
if value is not None))
157
# filter out ghosts; merge_sort errors on ghosts.
158
# XXX: is this needed here ? -- vila080910
159
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
160
# XXX: what if rev_graph is empty now ? -- vila080910
161
merge_sorted_revisions = tsort.merge_sort(rev_graph, tip,
152
164
# Now that we got the correct revnos, keep only the relevant
154
166
merge_sorted_revisions = [
155
# log.reverse_by_depth expects seq_num to be present, but it is
156
# stripped by iter_merge_sorted_revisions()
157
(0, revid, n, d, e) for revid, n, d, e in merge_sorted_revisions
167
(s, revid, n, d, e) for s, revid, n, d, e in merge_sorted_revisions
158
168
if revid in ancestry]
160
170
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
167
def _filter_revs(graph, revs, revid_range):
168
if revid_range is None or revs is None:
170
return [rev for rev in revs
171
if graph.is_between(rev[1], revid_range[0], revid_range[1])]
174
177
def _find_unmerged(local_branch, remote_branch, restrict,
175
include_merged, backward,
176
local_revid_range=None, remote_revid_range=None):
178
include_merges, backward):
177
179
"""See find_unmerged.
179
181
The branches should already be locked before entering.
198
200
' "remote": %r' % (restrict,))
199
201
local_extra, remote_extra = graph.find_difference(local_revision_id,
200
202
remote_revision_id)
202
204
locals = _enumerate_with_merges(local_branch, local_extra,
203
205
graph, local_revno,
204
206
local_revision_id, backward)
212
214
local_revision_id, backward)
213
215
remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
214
216
remote_revision_id, backward)
215
return _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
216
remotes, remote_revid_range)
217
return locals, remotes
219
220
def sorted_revisions(revisions, history_map):