1
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
6
def iter_log_data(revisions, revision_source, verbose):
7
from bzrlib.diff import compare_trees
8
from bzrlib.tree import EmptyTree
11
for revno, rev_id in revisions:
12
rev = revision_source.get_revision(rev_id)
14
remote_tree = revision_source.revision_tree(rev_id)
15
parent_rev_id = rev.parent_ids[0]
16
if last_rev_id == parent_rev_id:
17
parent_tree = last_tree
19
parent_tree = revision_source.revision_tree(parent_rev_id)
20
revision_tree = revision_source.revision_tree(rev_id)
22
last_tree = revision_tree
23
delta = compare_trees(revision_tree, parent_tree)
26
yield revno, rev, delta
29
def find_unmerged(local_branch, remote_branch):
30
progress = ui.ui_factory.nested_progress_bar()
31
local_branch.lock_read()
33
remote_branch.lock_read()
35
local_rev_history, local_rev_history_map = \
36
_get_history(local_branch, progress, "local", 0)
37
remote_rev_history, remote_rev_history_map = \
38
_get_history(remote_branch, progress, "remote", 1)
39
result = _shortcut(local_rev_history, remote_rev_history)
40
if result is not None:
41
local_extra, remote_extra = result
42
local_extra = sorted_revisions(local_extra,
43
local_rev_history_map)
44
remote_extra = sorted_revisions(remote_extra,
45
remote_rev_history_map)
46
return local_extra, remote_extra
48
local_ancestry = _get_ancestry(local_branch.repository, progress,
49
"local", 2, local_rev_history)
50
remote_ancestry = _get_ancestry(remote_branch.repository, progress,
51
"remote", 3, remote_rev_history)
52
progress.update('pondering', 4, 5)
53
extras = local_ancestry.symmetric_difference(remote_ancestry)
54
local_extra = extras.intersection(set(local_rev_history))
55
remote_extra = extras.intersection(set(remote_rev_history))
56
local_extra = sorted_revisions(local_extra, local_rev_history_map)
57
remote_extra = sorted_revisions(remote_extra,
58
remote_rev_history_map)
61
remote_branch.unlock()
65
return (local_extra, remote_extra)
67
def _shortcut(local_rev_history, remote_rev_history):
68
local_history = set(local_rev_history)
69
remote_history = set(remote_rev_history)
70
if len(local_rev_history) == 0:
71
return set(), remote_history
72
elif len(remote_rev_history) == 0:
73
return local_history, set()
74
elif local_rev_history[-1] in remote_history:
75
return set(), _after(remote_rev_history, local_rev_history)
76
elif remote_rev_history[-1] in local_history:
77
return _after(local_rev_history, remote_rev_history), set()
81
def _after(larger_history, smaller_history):
82
return set(larger_history[larger_history.index(smaller_history[-1])+1:])
84
def _get_history(branch, progress, label, step):
85
progress.update('%s history' % label, step, 5)
86
rev_history = branch.revision_history()
87
rev_history_map = dict(
88
[(rev, rev_history.index(rev) + 1)
89
for rev in rev_history])
90
return rev_history, rev_history_map
92
def _get_ancestry(repository, progress, label, step, rev_history):
93
progress.update('%s ancestry' % label, step, 5)
94
if len(rev_history) > 0:
95
ancestry = set(repository.get_ancestry(rev_history[-1]))
101
def sorted_revisions(revisions, history_map):
102
revisions = [(history_map[r],r) for r in revisions]
added
removed
bzrlib/missing.py
