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."""
23
import bzrlib.revision as _mod_revision
20
from bzrlib.log import (
23
from bzrlib.symbol_versioning import (
29
@deprecated_function(zero_seventeen)
30
def iter_log_data(revisions, revision_source, verbose):
31
for revision in iter_log_revisions(revisions, revision_source, verbose):
32
yield revision.revno, revision.rev, revision.delta
26
35
def iter_log_revisions(revisions, revision_source, verbose):
27
last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
36
last_tree = revision_source.revision_tree(None)
30
# We need the following for backward compatibilty (hopefully
31
# this will be deprecated soon :-/) -- vila 080911
36
revno, rev_id, merge_depth = rev
38
for revno, rev_id in revisions:
37
39
rev = revision_source.get_revision(rev_id)
39
delta = revision_source.get_revision_delta(rev_id)
41
remote_tree = revision_source.revision_tree(rev_id)
42
parent_rev_id = rev.parent_ids[0]
43
if last_rev_id == parent_rev_id:
44
parent_tree = last_tree
46
parent_tree = revision_source.revision_tree(parent_rev_id)
47
revision_tree = revision_source.revision_tree(rev_id)
49
last_tree = revision_tree
50
delta = revision_tree.changes_from(parent_tree)
42
yield log.LogRevision(rev, revno, merge_depth, delta=delta)
45
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):
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_merged: 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)
66
:param include_merges: Deprecated historical alias for include_merged
68
: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
53
yield LogRevision(rev, revno, delta=delta)
56
def find_unmerged(local_branch, remote_branch):
57
progress = ui.ui_factory.nested_progress_bar()
80
58
local_branch.lock_read()
82
60
remote_branch.lock_read()
84
return _find_unmerged(
85
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)
62
# check for special case: both branches are equivalent
63
if (local_branch.last_revision_info() ==
64
remote_branch.last_revision_info()):
66
local_rev_history, local_rev_history_map = \
67
_get_history(local_branch, progress, "local", 0)
68
remote_rev_history, remote_rev_history_map = \
69
_get_history(remote_branch, progress, "remote", 1)
70
result = _shortcut(local_rev_history, remote_rev_history)
71
if result is not None:
72
local_extra, remote_extra = result
73
local_extra = sorted_revisions(local_extra,
74
local_rev_history_map)
75
remote_extra = sorted_revisions(remote_extra,
76
remote_rev_history_map)
77
return local_extra, remote_extra
79
local_ancestry = _get_ancestry(local_branch.repository, progress,
80
"local", 2, local_rev_history)
81
remote_ancestry = _get_ancestry(remote_branch.repository, progress,
82
"remote", 3, remote_rev_history)
83
progress.update('pondering', 4, 5)
84
extras = local_ancestry.symmetric_difference(remote_ancestry)
85
local_extra = extras.intersection(set(local_rev_history))
86
remote_extra = extras.intersection(set(remote_rev_history))
87
local_extra = sorted_revisions(local_extra, local_rev_history_map)
88
remote_extra = sorted_revisions(remote_extra,
89
remote_rev_history_map)
90
92
remote_branch.unlock()
92
94
local_branch.unlock()
95
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
96
"""Enumerate the mainline revisions for these revisions.
98
:param ancestry: A set of revisions that we care about
99
:param graph: A Graph which lets us find the parents for a revision
100
:param tip_revno: The revision number for the tip revision
101
:param tip: The tip of mainline
102
:param backward: Show oldest versions first when True, newest versions
104
:return: [(revno, revision_id)] for all revisions in ancestry that
105
are left-hand parents from tip, or None if ancestry is None.
109
if not ancestry: #Empty ancestry, no need to do any work
112
# Optionally, we could make 1 call to graph.get_parent_map with all
113
# ancestors. However that will often check many more parents than we
114
# actually need, and the Graph is likely to already have the parents cached
118
cur_revno = tip_revno
119
while cur in ancestry:
120
parent_map = graph.get_parent_map([cur])
121
parents = parent_map.get(cur)
123
break # Ghost, we are done
124
mainline.append((str(cur_revno), cur))
132
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
134
"""Enumerate the revisions for the ancestry.
136
:param branch: The branch we care about
137
:param ancestry: A set of revisions that we care about
138
:param graph: A Graph which lets us find the parents for a revision
139
:param tip_revno: The revision number for the tip revision
140
:param tip: The tip of the ancsetry
141
:param backward: Show oldest versions first when True, newest versions
143
:return: [(revno, revision_id)] for all revisions in ancestry that
144
are parents from tip, or None if ancestry is None.
148
if not ancestry: #Empty ancestry, no need to do any work
151
merge_sorted_revisions = branch.iter_merge_sorted_revisions()
152
# Now that we got the correct revnos, keep only the relevant
154
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
158
if revid in ancestry]
160
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
162
for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
163
revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
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
def _find_unmerged(local_branch, remote_branch, restrict,
175
include_merged, backward,
176
local_revid_range=None, remote_revid_range=None):
177
"""See find_unmerged.
179
The branches should already be locked before entering.
181
local_revno, local_revision_id = local_branch.last_revision_info()
182
remote_revno, remote_revision_id = remote_branch.last_revision_info()
183
if local_revno == remote_revno and local_revision_id == remote_revision_id:
184
# A simple shortcut when the tips are at the same point
186
graph = local_branch.repository.get_graph(remote_branch.repository)
187
if restrict == 'remote':
189
remote_extra = graph.find_unique_ancestors(remote_revision_id,
191
elif restrict == 'local':
193
local_extra = graph.find_unique_ancestors(local_revision_id,
194
[remote_revision_id])
196
if restrict != 'all':
197
raise ValueError('param restrict not one of "all", "local",'
198
' "remote": %r' % (restrict,))
199
local_extra, remote_extra = graph.find_difference(local_revision_id,
202
locals = _enumerate_with_merges(local_branch, local_extra,
204
local_revision_id, backward)
205
remotes = _enumerate_with_merges(remote_branch, remote_extra,
207
remote_revision_id, backward)
209
# Now that we have unique ancestors, compute just the mainline, and
210
# generate revnos for them.
211
locals = _enumerate_mainline(local_extra, graph, local_revno,
212
local_revision_id, backward)
213
remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
214
remote_revision_id, backward)
215
return _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
216
remotes, remote_revid_range)
96
return (local_extra, remote_extra)
98
def _shortcut(local_rev_history, remote_rev_history):
99
local_history = set(local_rev_history)
100
remote_history = set(remote_rev_history)
101
if len(local_rev_history) == 0:
102
return set(), remote_history
103
elif len(remote_rev_history) == 0:
104
return local_history, set()
105
elif local_rev_history[-1] in remote_history:
106
return set(), _after(remote_rev_history, local_rev_history)
107
elif remote_rev_history[-1] in local_history:
108
return _after(local_rev_history, remote_rev_history), set()
112
def _after(larger_history, smaller_history):
113
return set(larger_history[larger_history.index(smaller_history[-1])+1:])
115
def _get_history(branch, progress, label, step):
116
progress.update('%s history' % label, step, 5)
117
rev_history = branch.revision_history()
118
rev_history_map = dict(
119
[(rev, rev_history.index(rev) + 1)
120
for rev in rev_history])
121
return rev_history, rev_history_map
123
def _get_ancestry(repository, progress, label, step, rev_history):
124
progress.update('%s ancestry' % label, step, 5)
125
if len(rev_history) > 0:
126
ancestry = set(repository.get_ancestry(rev_history[-1],
219
133
def sorted_revisions(revisions, history_map):
220
134
revisions = [(history_map[r],r) for r in revisions]
added
removed
bzrlib/missing.py
