← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Martin Pool
  • Date: 2005-07-22 22:37:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050722223753-7dced4e32d3ce21d
- add the start of a test for inventory file-id matching

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
 
    from bzrlib.diff import compare_trees
8
 
    last_tree = revision_source.revision_tree(None)
9
 
    last_rev_id = None
10
 
    for revno, rev_id in revisions:
11
 
        rev = revision_source.get_revision(rev_id)
12
 
        if verbose:
13
 
            remote_tree = revision_source.revision_tree(rev_id)
14
 
            parent_rev_id = rev.parent_ids[0]
15
 
            if last_rev_id == parent_rev_id:
16
 
                parent_tree = last_tree
17
 
            else:
18
 
                parent_tree = revision_source.revision_tree(parent_rev_id)
19
 
            revision_tree = revision_source.revision_tree(rev_id)
20
 
            last_rev_id = rev_id
21
 
            last_tree = revision_tree
22
 
            delta = compare_trees(revision_tree, parent_tree)
23
 
        else:
24
 
            delta = None
25
 
        yield revno, rev, delta
26
 
 
27
 
 
28
 
def find_unmerged(local_branch, remote_branch):
29
 
    progress = ui.ui_factory.nested_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.finished()
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