← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

[merge] update from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
1
1
"""\
2
2
A plugin for displaying what revisions are in 'other' but not in local.
3
3
"""
4
 
 
5
 
def show_missing(br_local, br_remote, verbose=False, quiet=False):
6
 
    """Show the revisions which exist in br_remote, that 
7
 
    do not exist in br_local.
8
 
    """
9
 
    from bzrlib.log import show_one_log
10
 
    import sys
11
 
    local_history = br_local.revision_history()
12
 
    remote_history = br_remote.revision_history()
13
 
    if local_history == remote_history:
14
 
        if not quiet:
15
 
            print 'Trees are identical.'
16
 
        return 0
17
 
    if local_history[:len(remote_history)] == remote_history:
18
 
        # Local is not missing anything from remote, so consider it
19
 
        # up-to-date
20
 
        if not quiet:
21
 
            print 'Local tree has all of remote revisions (remote is missing local)'
22
 
        return 0
23
 
    if quiet:
24
 
        return 1
25
 
 
26
 
    # Check for divergence
27
 
    common_idx = min(len(local_history), len(remote_history)) - 1
28
 
    if common_idx >= 0 and local_history[common_idx] != remote_history[common_idx]:
29
 
        print 'Trees have diverged'
30
 
 
31
 
    local_rev_set = set(local_history)
32
 
 
33
 
    # Find the last common revision between the two trees
34
 
    revno = 0
35
 
    for revno, (local_rev, remote_rev) in enumerate(zip(local_history, remote_history)):
36
 
        if local_rev != remote_rev:
37
 
            break
38
 
 
39
 
    missing_remote = []
40
 
    for rno, rev_id in enumerate(remote_history[revno:]):
41
 
        # This assumes that you can have a revision in the
42
 
        # local history, which does not have the same ancestry
43
 
        # as the remote ancestry.
44
 
        # This may or may not be possible.
45
 
        # In the future this should also checked for merged revisions.
46
 
        if rev_id not in local_rev_set:
47
 
            missing_remote.append((rno+revno+1, rev_id))
48
 
 
49
 
    print 'Missing %d revisions' %  len(missing_remote)
50
 
    print
51
 
 
52
 
    if verbose:
53
 
        from bzrlib.diff import compare_trees
54
 
        from bzrlib.tree import EmptyTree
55
 
        show_ids = True
56
 
        last_tree = EmptyTree
57
 
        last_rev_id = None
58
 
    else:
59
 
        show_ids = False
60
 
    for revno, rev_id in missing_remote:
61
 
        rev = br_remote.get_revision(rev_id)
 
4
from bzrlib.ui import ui_factory
 
5
def iter_log_data(revisions, revision_source, verbose):
 
6
    from bzrlib.diff import compare_trees
 
7
    from bzrlib.tree import EmptyTree
 
8
    last_tree = EmptyTree
 
9
    last_rev_id = None
 
10
    for revno, rev_id in revisions:
 
11
        rev = revision_source.get_revision(rev_id)
62
12
        if verbose:
63
 
            parent_rev_id = rev.parents[0].revision_id
 
13
            remote_tree = revision_source.revision_tree(rev_id)
 
14
            parent_rev_id = rev.parent_ids[0]
64
15
            if last_rev_id == parent_rev_id:
65
16
                parent_tree = last_tree
66
17
            else:
67
 
                parent_tree = br_remote.revision_tree(parent_rev_id)
68
 
            revision_tree = br_remote.revision_tree(rev_id)
 
18
                parent_tree = revision_source.revision_tree(parent_rev_id)
 
19
            revision_tree = revision_source.revision_tree(rev_id)
69
20
            last_rev_id = rev_id
70
21
            last_tree = revision_tree
71
22
            delta = compare_trees(revision_tree, parent_tree)
72
23
        else:
73
24
            delta = None
74
 
 
75
 
        show_one_log(revno, rev, delta, verbose, sys.stdout, 'original')
76
 
    return 1
77
 
 
 
25
        yield revno, rev, delta
 
26
 
 
27
 
 
28
def find_unmerged(local_branch, remote_branch):
 
29
    progress = ui_factory.progress_bar()
 
30
    local_branch.lock_read()
 
31
    try:
 
32
        remote_branch.lock_read()
 
33
        try:
 
34
            local_rev_history, local_rev_history_map = \
 
35
                _get_history(local_branch, progress, "local", 0)
 
36
            remote_rev_history, remote_rev_history_map = \
 
37
                _get_history(remote_branch, progress, "remote", 1)
 
38
            result = _shortcut(local_rev_history, remote_rev_history)
 
39
            if result is not None:
 
40
                local_extra, remote_extra = result
 
41
                local_extra = sorted_revisions(local_extra, 
 
42
                                               local_rev_history_map)
 
43
                remote_extra = sorted_revisions(remote_extra, 
 
44
                                                remote_rev_history_map)
 
45
                return local_extra, remote_extra
 
46
 
 
47
            local_ancestry = _get_ancestry(local_branch.repository, progress, 
 
48
                                           "local", 2, local_rev_history)
 
49
            remote_ancestry = _get_ancestry(remote_branch.repository, progress,
 
50
                                            "remote", 3, remote_rev_history)
 
51
            progress.update('pondering', 4, 5)
 
52
            extras = local_ancestry.symmetric_difference(remote_ancestry) 
 
53
            local_extra = extras.intersection(set(local_rev_history))
 
54
            remote_extra = extras.intersection(set(remote_rev_history))
 
55
            local_extra = sorted_revisions(local_extra, local_rev_history_map)
 
56
            remote_extra = sorted_revisions(remote_extra, 
 
57
                                            remote_rev_history_map)
 
58
                    
 
59
        finally:
 
60
            remote_branch.unlock()
 
61
    finally:
 
62
        local_branch.unlock()
 
63
        progress.clear()
 
64
    return (local_extra, remote_extra)
 
65
 
 
66
def _shortcut(local_rev_history, remote_rev_history):
 
67
    local_history = set(local_rev_history)
 
68
    remote_history = set(remote_rev_history)
 
69
    if len(local_rev_history) == 0:
 
70
        return set(), remote_history
 
71
    elif len(remote_rev_history) == 0:
 
72
        return local_history, set()
 
73
    elif local_rev_history[-1] in remote_history:
 
74
        return set(), _after(remote_rev_history, local_rev_history)
 
75
    elif remote_rev_history[-1] in local_history:
 
76
        return _after(local_rev_history, remote_rev_history), set()
 
77
    else:
 
78
        return None
 
79
 
 
80
def _after(larger_history, smaller_history):
 
81
    return set(larger_history[larger_history.index(smaller_history[-1])+1:])
 
82
 
 
83
def _get_history(branch, progress, label, step):
 
84
    progress.update('%s history' % label, step, 5)
 
85
    rev_history = branch.revision_history()
 
86
    rev_history_map = dict(
 
87
        [(rev, rev_history.index(rev) + 1)
 
88
         for rev in rev_history])
 
89
    return rev_history, rev_history_map
 
90
 
 
91
def _get_ancestry(repository, progress, label, step, rev_history):
 
92
    progress.update('%s ancestry' % label, step, 5)
 
93
    if len(rev_history) > 0:
 
94
        ancestry = set(repository.get_ancestry(rev_history[-1]))
 
95
    else:
 
96
        ancestry = set()
 
97
    return ancestry
 
98
    
 
99
 
 
100
def sorted_revisions(revisions, history_map):
 
101
    revisions = [(history_map[r],r) for r in revisions]
 
102
    revisions.sort()
 
103
    return revisions