3
A plugin for displaying what revisions are in 'other' but not in local.
11
from sets import Set as set
14
def get_parent(branch):
15
"""Get the last pull/push location.
17
TODO: This should probably be part of a Branch object.
20
_locs = ['parent', 'pull', 'x-pull']
24
stored_loc = branch.controlfile(l, 'rb').read().strip('\n')
26
if e.errno != errno.ENOENT:
32
def show_missing(br_local, br_remote, verbose=False, quiet=False):
33
"""Show the revisions which exist in br_remote, that
34
do not exist in br_local.
36
from bzrlib.log import show_one_log
38
local_history = br_local.revision_history()
39
remote_history = br_remote.revision_history()
40
if local_history == remote_history:
42
print 'Trees are identical.'
44
if local_history[:len(remote_history)] == remote_history:
45
# Local is not missing anything from remote, so consider it
48
print 'Local tree has all of remote revisions (remote is missing local)'
53
# Check for divergence
54
common_idx = min(len(local_history), len(remote_history)) - 1
55
if common_idx >= 0 and local_history[common_idx] != remote_history[common_idx]:
56
print 'Trees have diverged'
58
local_rev_set = set(local_history)
60
# Find the last common revision between the two trees
62
for revno, (local_rev, remote_rev) in enumerate(zip(local_history, remote_history)):
63
if local_rev != remote_rev:
67
for rno, rev_id in enumerate(remote_history[revno:]):
68
# This assumes that you can have a revision in the
69
# local history, which does not have the same ancestry
70
# as the remote ancestry.
71
# This may or may not be possible.
72
# In the future this should also checked for merged revisions.
73
if rev_id not in local_rev_set:
74
missing_remote.append((rno+revno+1, rev_id))
76
print 'Missing %d revisions' % len(missing_remote)
80
from bzrlib.diff import compare_trees
81
from bzrlib.tree import EmptyTree
87
for revno, rev_id in missing_remote:
88
rev = br_remote.get_revision(rev_id)
1
# Copyright (C) 2005, 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
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
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
19
import bzrlib.ui as ui
22
def iter_log_data(revisions, revision_source, verbose):
23
last_tree = revision_source.revision_tree(None)
25
for revno, rev_id in revisions:
26
rev = revision_source.get_revision(rev_id)
90
parent_rev_id = rev.parents[0].revision_id
28
remote_tree = revision_source.revision_tree(rev_id)
29
parent_rev_id = rev.parent_ids[0]
91
30
if last_rev_id == parent_rev_id:
92
31
parent_tree = last_tree
94
parent_tree = br_remote.revision_tree(parent_rev_id)
95
revision_tree = br_remote.revision_tree(rev_id)
33
parent_tree = revision_source.revision_tree(parent_rev_id)
34
revision_tree = revision_source.revision_tree(rev_id)
96
35
last_rev_id = rev_id
97
36
last_tree = revision_tree
98
delta = compare_trees(revision_tree, parent_tree)
37
delta = revision_tree.changes_from(parent_tree)
102
show_one_log(revno, rev, delta, verbose, sys.stdout, 'original')
40
yield revno, rev, delta
43
def find_unmerged(local_branch, remote_branch):
44
progress = ui.ui_factory.nested_progress_bar()
45
local_branch.lock_read()
47
remote_branch.lock_read()
49
local_rev_history, local_rev_history_map = \
50
_get_history(local_branch, progress, "local", 0)
51
remote_rev_history, remote_rev_history_map = \
52
_get_history(remote_branch, progress, "remote", 1)
53
result = _shortcut(local_rev_history, remote_rev_history)
54
if result is not None:
55
local_extra, remote_extra = result
56
local_extra = sorted_revisions(local_extra,
57
local_rev_history_map)
58
remote_extra = sorted_revisions(remote_extra,
59
remote_rev_history_map)
60
return local_extra, remote_extra
62
local_ancestry = _get_ancestry(local_branch.repository, progress,
63
"local", 2, local_rev_history)
64
remote_ancestry = _get_ancestry(remote_branch.repository, progress,
65
"remote", 3, remote_rev_history)
66
progress.update('pondering', 4, 5)
67
extras = local_ancestry.symmetric_difference(remote_ancestry)
68
local_extra = extras.intersection(set(local_rev_history))
69
remote_extra = extras.intersection(set(remote_rev_history))
70
local_extra = sorted_revisions(local_extra, local_rev_history_map)
71
remote_extra = sorted_revisions(remote_extra,
72
remote_rev_history_map)
75
remote_branch.unlock()
79
return (local_extra, remote_extra)
81
def _shortcut(local_rev_history, remote_rev_history):
82
local_history = set(local_rev_history)
83
remote_history = set(remote_rev_history)
84
if len(local_rev_history) == 0:
85
return set(), remote_history
86
elif len(remote_rev_history) == 0:
87
return local_history, set()
88
elif local_rev_history[-1] in remote_history:
89
return set(), _after(remote_rev_history, local_rev_history)
90
elif remote_rev_history[-1] in local_history:
91
return _after(local_rev_history, remote_rev_history), set()
95
def _after(larger_history, smaller_history):
96
return set(larger_history[larger_history.index(smaller_history[-1])+1:])
98
def _get_history(branch, progress, label, step):
99
progress.update('%s history' % label, step, 5)
100
rev_history = branch.revision_history()
101
rev_history_map = dict(
102
[(rev, rev_history.index(rev) + 1)
103
for rev in rev_history])
104
return rev_history, rev_history_map
106
def _get_ancestry(repository, progress, label, step, rev_history):
107
progress.update('%s ancestry' % label, step, 5)
108
if len(rev_history) > 0:
109
ancestry = set(repository.get_ancestry(rev_history[-1]))
115
def sorted_revisions(revisions, history_map):
116
revisions = [(history_map[r],r) for r in revisions]
added
removed
bzrlib/missing.py
