~bzr-pqm/bzr/bzr.dev

974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1
"""\
2
A plugin for displaying what revisions are in 'other' but not in local.
3
"""
4
5
import bzrlib
6
7
try:
8
    set
9
except NameError:
10
    from sets import Set as set
11
12
13
def show_missing(br_local, br_remote, verbose=False, quiet=False):
14
    """Show the revisions which exist in br_remote, that 
15
    do not exist in br_local.
16
    """
17
    from bzrlib.log import show_one_log
18
    import sys
19
    local_history = br_local.revision_history()
20
    remote_history = br_remote.revision_history()
21
    if local_history == remote_history:
22
        if not quiet:
23
            print 'Trees are identical.'
24
        return 0
25
    if local_history[:len(remote_history)] == remote_history:
26
        # Local is not missing anything from remote, so consider it
27
        # up-to-date
28
        if not quiet:
29
            print 'Local tree has all of remote revisions (remote is missing local)'
30
        return 0
31
    if quiet:
32
        return 1
33
34
    # Check for divergence
35
    common_idx = min(len(local_history), len(remote_history)) - 1
36
    if common_idx >= 0 and local_history[common_idx] != remote_history[common_idx]:
37
        print 'Trees have diverged'
38
39
    local_rev_set = set(local_history)
40
41
    # Find the last common revision between the two trees
42
    revno = 0
43
    for revno, (local_rev, remote_rev) in enumerate(zip(local_history, remote_history)):
44
        if local_rev != remote_rev:
45
            break
46
47
    missing_remote = []
48
    for rno, rev_id in enumerate(remote_history[revno:]):
49
        # This assumes that you can have a revision in the
50
        # local history, which does not have the same ancestry
51
        # as the remote ancestry.
52
        # This may or may not be possible.
53
        # In the future this should also checked for merged revisions.
54
        if rev_id not in local_rev_set:
55
            missing_remote.append((rno+revno+1, rev_id))
56
57
    print 'Missing %d revisions' %  len(missing_remote)
58
    print
59
60
    if verbose:
61
        from bzrlib.diff import compare_trees
62
        from bzrlib.tree import EmptyTree
63
        show_ids = True
64
        last_tree = EmptyTree
65
        last_rev_id = None
66
    else:
67
        show_ids = False
68
    for revno, rev_id in missing_remote:
69
        rev = br_remote.get_revision(rev_id)
70
        if verbose:
71
            parent_rev_id = rev.parents[0].revision_id
72
            if last_rev_id == parent_rev_id:
73
                parent_tree = last_tree
74
            else:
75
                parent_tree = br_remote.revision_tree(parent_rev_id)
76
            revision_tree = br_remote.revision_tree(rev_id)
77
            last_rev_id = rev_id
78
            last_tree = revision_tree
79
            delta = compare_trees(revision_tree, parent_tree)
80
        else:
81
            delta = None
82
83
        show_one_log(revno, rev, delta, verbose, sys.stdout, 'original')
84
    return 1
85