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
from bzrlib.log import (
22
import bzrlib.revision as _mod_revision
25
24
def iter_log_revisions(revisions, revision_source, verbose):
26
last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
25
last_tree = revision_source.revision_tree(None)
29
# We need the following for backward compatibilty (hopefully
30
# this will be deprecated soon :-/) -- vila 080911
35
revno, rev_id, merge_depth = rev
27
for revno, rev_id in revisions:
36
28
rev = revision_source.get_revision(rev_id)
38
delta = revision_source.get_revision_delta(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)
41
yield log.LogRevision(rev, revno, merge_depth, delta=delta)
44
def find_unmerged(local_branch, remote_branch, restrict='all',
45
include_merges=False, backward=False,
46
local_revid_range=None, remote_revid_range=None):
47
"""Find revisions from each side that have not been merged.
49
:param local_branch: Compare the history of local_branch
50
:param remote_branch: versus the history of remote_branch, and determine
51
mainline revisions which have not been merged.
52
:param restrict: ('all', 'local', 'remote') If 'all', we will return the
53
unique revisions from both sides. If 'local', we will return None
54
for the remote revisions, similarly if 'remote' we will return None for
56
:param include_merges: Show mainline revisions only if False,
57
all revisions otherwise.
58
:param backward: Show oldest versions first when True, newest versions
60
:param local_revid_range: Revision-id range for filtering local_branch
61
revisions (lower bound, upper bound)
62
:param remote_revid_range: Revision-id range for filtering remote_branch
63
revisions (lower bound, upper bound)
65
:return: A list of [(revno, revision_id)] for the mainline revisions on
42
yield LogRevision(rev, revno, delta=delta)
45
def find_unmerged(local_branch, remote_branch, restrict='all'):
68
46
local_branch.lock_read()
70
48
remote_branch.lock_read()
72
return _find_unmerged(
73
local_branch, remote_branch, restrict=restrict,
74
include_merges=include_merges, backward=backward,
75
local_revid_range=local_revid_range,
76
remote_revid_range=remote_revid_range)
50
return _find_unmerged(local_branch,
51
remote_branch, restrict=restrict)
78
53
remote_branch.unlock()
80
55
local_branch.unlock()
83
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
58
def _enumerate_mainline(ancestry, graph, tip_revno, tip):
84
59
"""Enumerate the mainline revisions for these revisions.
86
61
:param ancestry: A set of revisions that we care about
87
62
:param graph: A Graph which lets us find the parents for a revision
88
63
:param tip_revno: The revision number for the tip revision
89
:param tip: The tip of mainline
90
:param backward: Show oldest versions first when True, newest versions
64
:param tip: The tip of mailine
92
65
:return: [(revno, revision_id)] for all revisions in ancestry that
93
are left-hand parents from tip, or None if ancestry is None.
66
left-hand parents from tip
95
68
if ancestry is None:
109
82
parents = parent_map.get(cur)
111
84
break # Ghost, we are done
112
mainline.append((str(cur_revno), cur))
85
mainline.append((cur_revno, cur))
120
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
122
"""Enumerate the revisions for the ancestry.
124
:param branch: The branch we care about
125
:param ancestry: A set of revisions that we care about
126
:param graph: A Graph which lets us find the parents for a revision
127
:param tip_revno: The revision number for the tip revision
128
:param tip: The tip of the ancsetry
129
:param backward: Show oldest versions first when True, newest versions
131
:return: [(revno, revision_id)] for all revisions in ancestry that
132
are parents from tip, or None if ancestry is None.
136
if not ancestry: #Empty ancestry, no need to do any work
139
merge_sorted_revisions = branch.iter_merge_sorted_revisions()
140
# Now that we got the correct revnos, keep only the relevant
142
merge_sorted_revisions = [
143
# log.reverse_by_depth expects seq_num to be present, but it is
144
# stripped by iter_merge_sorted_revisions()
145
(0, revid, n, d, e) for revid, n, d, e in merge_sorted_revisions
146
if revid in ancestry]
148
merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
150
for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
151
revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
155
def _filter_revs(graph, revs, revid_range):
156
if revid_range is None or revs is None:
158
return [rev for rev in revs
159
if graph.is_between(rev[1], revid_range[0], revid_range[1])]
162
def _find_unmerged(local_branch, remote_branch, restrict,
163
include_merges, backward,
164
local_revid_range=None, remote_revid_range=None):
165
"""See find_unmerged.
167
The branches should already be locked before entering.
92
def _find_unmerged(local_branch, remote_branch, restrict):
93
"""Find revisions from each side that have not been merged.
95
Both branches should already be locked.
97
:param local_branch: Compare the history of local_branch
98
:param remote_branch: versus the history of remote_branch, and determine
99
mainline revisions which have not been merged.
100
:param restrict: ('all', 'local', 'remote') If 'all', we will return the
101
unique revisions from both sides. If 'local', we will return None
102
for the remote revisions, similarly if 'remote' we will return None for
105
:return: A list of [(revno, revision_id)] for the mainline revisions on
108
graph = local_branch.repository.get_graph(
109
remote_branch.repository)
169
110
local_revno, local_revision_id = local_branch.last_revision_info()
170
111
remote_revno, remote_revision_id = remote_branch.last_revision_info()
171
112
if local_revno == remote_revno and local_revision_id == remote_revision_id:
172
113
# A simple shortcut when the tips are at the same point
174
graph = local_branch.repository.get_graph(remote_branch.repository)
175
115
if restrict == 'remote':
176
116
local_extra = None
177
remote_extra = graph.find_unique_ancestors(remote_revision_id,
117
remote_extra = graph.find_unique_ancestors(
118
remote_revision_id, [local_revision_id])
179
119
elif restrict == 'local':
180
120
remote_extra = None
181
local_extra = graph.find_unique_ancestors(local_revision_id,
182
[remote_revision_id])
121
local_extra = graph.find_unique_ancestors(
122
local_revision_id, [remote_revision_id])
184
124
if restrict != 'all':
185
125
raise ValueError('param restrict not one of "all", "local",'
186
126
' "remote": %r' % (restrict,))
187
local_extra, remote_extra = graph.find_difference(local_revision_id,
190
locals = _enumerate_with_merges(local_branch, local_extra,
192
local_revision_id, backward)
193
remotes = _enumerate_with_merges(remote_branch, remote_extra,
195
remote_revision_id, backward)
197
# Now that we have unique ancestors, compute just the mainline, and
198
# generate revnos for them.
199
locals = _enumerate_mainline(local_extra, graph, local_revno,
200
local_revision_id, backward)
201
remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
202
remote_revision_id, backward)
203
return _filter_revs(graph, locals, local_revid_range), _filter_revs(graph,
204
remotes, remote_revid_range)
127
local_extra, remote_extra = graph.find_difference(
128
local_revision_id, remote_revision_id)
129
# Now that we have unique ancestors, compute just the mainline, and
130
# generate revnos for them.
131
local_mainline = _enumerate_mainline(local_extra, graph, local_revno,
133
remote_mainline = _enumerate_mainline(remote_extra, graph, remote_revno,
135
return local_mainline, remote_mainline
207
138
def sorted_revisions(revisions, history_map):
added
removed
bzrlib/missing.py
