← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

merge merge tweaks from aaron, which includes latest .dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
1
 
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
2
 
 
3
 
import bzrlib.ui as ui
4
 
 
5
 
 
6
 
def iter_log_data(revisions, revision_source, verbose):
7
 
    last_tree = revision_source.revision_tree(None)
8
 
    last_rev_id = None
9
 
    for revno, rev_id in revisions:
10
 
        rev = revision_source.get_revision(rev_id)
 
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)
11
70
        if verbose:
12
 
            remote_tree = revision_source.revision_tree(rev_id)
13
 
            parent_rev_id = rev.parent_ids[0]
 
71
            parent_rev_id = rev.parents[0].revision_id
14
72
            if last_rev_id == parent_rev_id:
15
73
                parent_tree = last_tree
16
74
            else:
17
 
                parent_tree = revision_source.revision_tree(parent_rev_id)
18
 
            revision_tree = revision_source.revision_tree(rev_id)
 
75
                parent_tree = br_remote.revision_tree(parent_rev_id)
 
76
            revision_tree = br_remote.revision_tree(rev_id)
19
77
            last_rev_id = rev_id
20
78
            last_tree = revision_tree
21
 
            delta = parent_tree.changes_from(revision_tree)
 
79
            delta = compare_trees(revision_tree, parent_tree)
22
80
        else:
23
81
            delta = None
24
 
        yield revno, rev, delta
25
 
 
26
 
 
27
 
def find_unmerged(local_branch, remote_branch):
28
 
    progress = ui.ui_factory.nested_progress_bar()
29
 
    local_branch.lock_read()
30
 
    try:
31
 
        remote_branch.lock_read()
32
 
        try:
33
 
            local_rev_history, local_rev_history_map = \
34
 
                _get_history(local_branch, progress, "local", 0)
35
 
            remote_rev_history, remote_rev_history_map = \
36
 
                _get_history(remote_branch, progress, "remote", 1)
37
 
            result = _shortcut(local_rev_history, remote_rev_history)
38
 
            if result is not None:
39
 
                local_extra, remote_extra = result
40
 
                local_extra = sorted_revisions(local_extra, 
41
 
                                               local_rev_history_map)
42
 
                remote_extra = sorted_revisions(remote_extra, 
43
 
                                                remote_rev_history_map)
44
 
                return local_extra, remote_extra
45
 
 
46
 
            local_ancestry = _get_ancestry(local_branch.repository, progress, 
47
 
                                           "local", 2, local_rev_history)
48
 
            remote_ancestry = _get_ancestry(remote_branch.repository, progress,
49
 
                                            "remote", 3, remote_rev_history)
50
 
            progress.update('pondering', 4, 5)
51
 
            extras = local_ancestry.symmetric_difference(remote_ancestry) 
52
 
            local_extra = extras.intersection(set(local_rev_history))
53
 
            remote_extra = extras.intersection(set(remote_rev_history))
54
 
            local_extra = sorted_revisions(local_extra, local_rev_history_map)
55
 
            remote_extra = sorted_revisions(remote_extra, 
56
 
                                            remote_rev_history_map)
57
 
                    
58
 
        finally:
59
 
            remote_branch.unlock()
60
 
    finally:
61
 
        local_branch.unlock()
62
 
        progress.finished()
63
 
    return (local_extra, remote_extra)
64
 
 
65
 
def _shortcut(local_rev_history, remote_rev_history):
66
 
    local_history = set(local_rev_history)
67
 
    remote_history = set(remote_rev_history)
68
 
    if len(local_rev_history) == 0:
69
 
        return set(), remote_history
70
 
    elif len(remote_rev_history) == 0:
71
 
        return local_history, set()
72
 
    elif local_rev_history[-1] in remote_history:
73
 
        return set(), _after(remote_rev_history, local_rev_history)
74
 
    elif remote_rev_history[-1] in local_history:
75
 
        return _after(local_rev_history, remote_rev_history), set()
76
 
    else:
77
 
        return None
78
 
 
79
 
def _after(larger_history, smaller_history):
80
 
    return set(larger_history[larger_history.index(smaller_history[-1])+1:])
81
 
 
82
 
def _get_history(branch, progress, label, step):
83
 
    progress.update('%s history' % label, step, 5)
84
 
    rev_history = branch.revision_history()
85
 
    rev_history_map = dict(
86
 
        [(rev, rev_history.index(rev) + 1)
87
 
         for rev in rev_history])
88
 
    return rev_history, rev_history_map
89
 
 
90
 
def _get_ancestry(repository, progress, label, step, rev_history):
91
 
    progress.update('%s ancestry' % label, step, 5)
92
 
    if len(rev_history) > 0:
93
 
        ancestry = set(repository.get_ancestry(rev_history[-1]))
94
 
    else:
95
 
        ancestry = set()
96
 
    return ancestry
97
 
    
98
 
 
99
 
def sorted_revisions(revisions, history_map):
100
 
    revisions = [(history_map[r],r) for r in revisions]
101
 
    revisions.sort()
102
 
    return revisions
 
82
 
 
83
        show_one_log(revno, rev, delta, verbose, sys.stdout, 'original')
 
84
    return 1
 
85