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 bzrlib.log import (
21
repository as _mod_repository,
24
import bzrlib.revision as _mod_revision
24
27
def iter_log_revisions(revisions, revision_source, verbose):
25
last_tree = revision_source.revision_tree(None)
28
last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
27
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
28
38
rev = revision_source.get_revision(rev_id)
30
remote_tree = revision_source.revision_tree(rev_id)
31
parent_rev_id = rev.parent_ids[0]
32
if last_rev_id == parent_rev_id:
33
parent_tree = last_tree
35
parent_tree = revision_source.revision_tree(parent_rev_id)
36
revision_tree = revision_source.revision_tree(rev_id)
38
last_tree = revision_tree
39
delta = revision_tree.changes_from(parent_tree)
40
delta = revision_source.get_revision_delta(rev_id)
42
yield LogRevision(rev, revno, delta=delta)
45
def find_unmerged(local_branch, remote_branch, restrict='all'):
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):
46
49
"""Find revisions from each side that have not been merged.
48
51
:param local_branch: Compare the history of local_branch
52
55
unique revisions from both sides. If 'local', we will return None
53
56
for the remote revisions, similarly if 'remote' we will return None for
54
57
the local revisions.
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)
56
67
:return: A list of [(revno, revision_id)] for the mainline revisions on
61
72
remote_branch.lock_read()
63
return _find_unmerged(local_branch,
64
remote_branch, restrict=restrict)
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)
66
80
remote_branch.unlock()
68
82
local_branch.unlock()
71
def _enumerate_mainline(ancestry, graph, tip_revno, tip):
85
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
72
86
"""Enumerate the mainline revisions for these revisions.
74
88
:param ancestry: A set of revisions that we care about
75
89
:param graph: A Graph which lets us find the parents for a revision
76
90
:param tip_revno: The revision number for the tip revision
77
91
:param tip: The tip of mainline
92
:param backward: Show oldest versions first when True, newest versions
78
94
:return: [(revno, revision_id)] for all revisions in ancestry that
79
95
are left-hand parents from tip, or None if ancestry is None.
95
111
parents = parent_map.get(cur)
97
113
break # Ghost, we are done
98
mainline.append((cur_revno, cur))
114
mainline.append((str(cur_revno), cur))
105
def _find_unmerged(local_branch, remote_branch, restrict):
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):
106
167
"""See find_unmerged.
108
169
The branches should already be locked before entering.
112
173
if local_revno == remote_revno and local_revision_id == remote_revision_id:
113
174
# A simple shortcut when the tips are at the same point
115
graph = local_branch.repository.get_graph(
116
remote_branch.repository)
176
graph = local_branch.repository.get_graph(remote_branch.repository)
117
177
if restrict == 'remote':
118
178
local_extra = None
119
remote_extra = graph.find_unique_ancestors(
120
remote_revision_id, [local_revision_id])
179
remote_extra = graph.find_unique_ancestors(remote_revision_id,
121
181
elif restrict == 'local':
122
182
remote_extra = None
123
local_extra = graph.find_unique_ancestors(
124
local_revision_id, [remote_revision_id])
183
local_extra = graph.find_unique_ancestors(local_revision_id,
184
[remote_revision_id])
126
186
if restrict != 'all':
127
187
raise ValueError('param restrict not one of "all", "local",'
128
188
' "remote": %r' % (restrict,))
129
local_extra, remote_extra = graph.find_difference(
130
local_revision_id, remote_revision_id)
131
# Now that we have unique ancestors, compute just the mainline, and
132
# generate revnos for them.
133
local_mainline = _enumerate_mainline(local_extra, graph, local_revno,
135
remote_mainline = _enumerate_mainline(remote_extra, graph, remote_revno,
137
return local_mainline, remote_mainline
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)
140
209
def sorted_revisions(revisions, history_map):
added
removed
bzrlib/missing.py
