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
|
#!/usr/bin/env python
"""\
A plugin for displaying what revisions are in 'other' but not in local.
"""
import bzrlib
try:
set
except NameError:
from sets import Set as set
def get_parent(branch):
"""Get the last pull/push location.
TODO: This should probably be part of a Branch object.
"""
import errno
_locs = ['parent', 'pull', 'x-pull']
loc = None
for l in _locs:
try:
stored_loc = branch.controlfile(l, 'rb').read().strip('\n')
except IOError, e:
if e.errno != errno.ENOENT:
raise
else:
return stored_loc
def show_missing(br_local, br_remote, verbose=False, quiet=False):
"""Show the revisions which exist in br_remote, that
do not exist in br_local.
"""
from bzrlib.log import show_one_log
import sys
local_history = br_local.revision_history()
remote_history = br_remote.revision_history()
if local_history == remote_history:
if not quiet:
print 'Trees are identical.'
return 0
if local_history[:len(remote_history)] == remote_history:
# Local is not missing anything from remote, so consider it
# up-to-date
if not quiet:
print 'Local tree has all of remote revisions (remote is missing local)'
return 0
if quiet:
return 1
# Check for divergence
common_idx = min(len(local_history), len(remote_history)) - 1
if common_idx >= 0 and local_history[common_idx] != remote_history[common_idx]:
print 'Trees have diverged'
local_rev_set = set(local_history)
# Find the last common revision between the two trees
revno = 0
for revno, (local_rev, remote_rev) in enumerate(zip(local_history, remote_history)):
if local_rev != remote_rev:
break
missing_remote = []
for rno, rev_id in enumerate(remote_history[revno:]):
# This assumes that you can have a revision in the
# local history, which does not have the same ancestry
# as the remote ancestry.
# This may or may not be possible.
# In the future this should also checked for merged revisions.
if rev_id not in local_rev_set:
missing_remote.append((rno+revno+1, rev_id))
print 'Missing %d revisions' % len(missing_remote)
print
if verbose:
from bzrlib.diff import compare_trees
from bzrlib.tree import EmptyTree
show_ids = True
last_tree = EmptyTree
last_rev_id = None
else:
show_ids = False
for revno, rev_id in missing_remote:
rev = br_remote.get_revision(rev_id)
if verbose:
parent_rev_id = rev.parents[0].revision_id
if last_rev_id == parent_rev_id:
parent_tree = last_tree
else:
parent_tree = br_remote.revision_tree(parent_rev_id)
revision_tree = br_remote.revision_tree(rev_id)
last_rev_id = rev_id
last_tree = revision_tree
delta = compare_trees(revision_tree, parent_tree)
else:
delta = None
show_one_log(revno, rev, delta, verbose, sys.stdout, 'original')
return 1
|