1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
# Copyright (C) 2005, 2006 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
from bzrlib import ui
from bzrlib.log import (
LogRevision,
)
def iter_log_revisions(revisions, revision_source, verbose):
last_tree = revision_source.revision_tree(None)
last_rev_id = None
for revno, rev_id in revisions:
rev = revision_source.get_revision(rev_id)
if verbose:
remote_tree = revision_source.revision_tree(rev_id)
parent_rev_id = rev.parent_ids[0]
if last_rev_id == parent_rev_id:
parent_tree = last_tree
else:
parent_tree = revision_source.revision_tree(parent_rev_id)
revision_tree = revision_source.revision_tree(rev_id)
last_rev_id = rev_id
last_tree = revision_tree
delta = revision_tree.changes_from(parent_tree)
else:
delta = None
yield LogRevision(rev, revno, delta=delta)
def find_unmerged(local_branch, remote_branch):
progress = ui.ui_factory.nested_progress_bar()
local_branch.lock_read()
try:
remote_branch.lock_read()
try:
# check for special case: both branches are equivalent
if (local_branch.last_revision_info() ==
remote_branch.last_revision_info()):
return [], []
local_rev_history, local_rev_history_map = \
_get_history(local_branch, progress, "local", 0)
remote_rev_history, remote_rev_history_map = \
_get_history(remote_branch, progress, "remote", 1)
result = _shortcut(local_rev_history, remote_rev_history)
if result is not None:
local_extra, remote_extra = result
local_extra = sorted_revisions(local_extra,
local_rev_history_map)
remote_extra = sorted_revisions(remote_extra,
remote_rev_history_map)
return local_extra, remote_extra
local_ancestry = _get_ancestry(local_branch.repository, progress,
"local", 2, local_rev_history)
remote_ancestry = _get_ancestry(remote_branch.repository, progress,
"remote", 3, remote_rev_history)
progress.update('pondering', 4, 5)
extras = local_ancestry.symmetric_difference(remote_ancestry)
local_extra = extras.intersection(set(local_rev_history))
remote_extra = extras.intersection(set(remote_rev_history))
local_extra = sorted_revisions(local_extra, local_rev_history_map)
remote_extra = sorted_revisions(remote_extra,
remote_rev_history_map)
finally:
remote_branch.unlock()
finally:
local_branch.unlock()
progress.finished()
return (local_extra, remote_extra)
def _shortcut(local_rev_history, remote_rev_history):
local_history = set(local_rev_history)
remote_history = set(remote_rev_history)
if len(local_rev_history) == 0:
return set(), remote_history
elif len(remote_rev_history) == 0:
return local_history, set()
elif local_rev_history[-1] in remote_history:
return set(), _after(remote_rev_history, local_rev_history)
elif remote_rev_history[-1] in local_history:
return _after(local_rev_history, remote_rev_history), set()
else:
return None
def _after(larger_history, smaller_history):
return set(larger_history[larger_history.index(smaller_history[-1])+1:])
def _get_history(branch, progress, label, step):
progress.update('%s history' % label, step, 5)
rev_history = branch.revision_history()
rev_history_map = dict(
[(rev, rev_history.index(rev) + 1)
for rev in rev_history])
return rev_history, rev_history_map
def _get_ancestry(repository, progress, label, step, rev_history):
progress.update('%s ancestry' % label, step, 5)
if len(rev_history) > 0:
ancestry = set(repository.get_ancestry(rev_history[-1],
topo_sorted=False))
else:
ancestry = set()
return ancestry
def sorted_revisions(revisions, history_map):
revisions = [(history_map[r],r) for r in revisions]
revisions.sort()
return revisions
|