~bzr-pqm/bzr/bzr.dev

1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
1534.5.15 by Robert Collins
Review fixups
2
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
3
import bzrlib.ui as ui
1534.5.15 by Robert Collins
Review fixups
4
5
1185.54.19 by Aaron Bentley
All tests pass
6
def iter_log_data(revisions, revision_source, verbose):
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
7
    last_tree = revision_source.revision_tree(None)
1185.54.19 by Aaron Bentley
All tests pass
8
    last_rev_id = None
9
    for revno, rev_id in revisions:
10
        rev = revision_source.get_revision(rev_id)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
11
        if verbose:
1185.67.1 by Aaron Bentley
Merged the mainline
12
            remote_tree = revision_source.revision_tree(rev_id)
1185.35.30 by Aaron Bentley
Fixed missing --verbose
13
            parent_rev_id = rev.parent_ids[0]
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
14
            if last_rev_id == parent_rev_id:
15
                parent_tree = last_tree
16
            else:
1185.54.19 by Aaron Bentley
All tests pass
17
                parent_tree = revision_source.revision_tree(parent_rev_id)
18
            revision_tree = revision_source.revision_tree(rev_id)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
19
            last_rev_id = rev_id
20
            last_tree = revision_tree
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
21
            delta = parent_tree.changes_from(revision_tree)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
22
        else:
23
            delta = None
1185.54.19 by Aaron Bentley
All tests pass
24
        yield revno, rev, delta
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
25
1185.54.7 by Aaron Bentley
More refactoring, handled branches with no commits
26
1185.54.3 by Aaron Bentley
Factored out find_unmerged
27
def find_unmerged(local_branch, remote_branch):
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
28
    progress = ui.ui_factory.nested_progress_bar()
1185.54.3 by Aaron Bentley
Factored out find_unmerged
29
    local_branch.lock_read()
30
    try:
31
        remote_branch.lock_read()
32
        try:
1185.54.9 by Aaron Bentley
Added revision-history shortcuts
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
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
46
            local_ancestry = _get_ancestry(local_branch.repository, progress, 
1185.67.1 by Aaron Bentley
Merged the mainline
47
                                           "local", 2, local_rev_history)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
48
            remote_ancestry = _get_ancestry(remote_branch.repository, progress,
1185.67.1 by Aaron Bentley
Merged the mainline
49
                                            "remote", 3, remote_rev_history)
1185.54.3 by Aaron Bentley
Factored out find_unmerged
50
            progress.update('pondering', 4, 5)
1185.54.6 by Aaron Bentley
Used more set operations
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))
1185.54.4 by Aaron Bentley
Restructured find_unmerged, so it returns lists of (revno, revision) pairs
54
            local_extra = sorted_revisions(local_extra, local_rev_history_map)
55
            remote_extra = sorted_revisions(remote_extra, 
56
                                            remote_rev_history_map)
1185.54.3 by Aaron Bentley
Factored out find_unmerged
57
                    
58
        finally:
59
            remote_branch.unlock()
60
    finally:
61
        local_branch.unlock()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
62
        progress.finished()
1185.54.4 by Aaron Bentley
Restructured find_unmerged, so it returns lists of (revno, revision) pairs
63
    return (local_extra, remote_extra)
64
1185.54.9 by Aaron Bentley
Added revision-history shortcuts
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:
1185.54.10 by Aaron Bentley
Refactored shortcut
73
        return set(), _after(remote_rev_history, local_rev_history)
1185.54.9 by Aaron Bentley
Added revision-history shortcuts
74
    elif remote_rev_history[-1] in local_history:
1185.54.10 by Aaron Bentley
Refactored shortcut
75
        return _after(local_rev_history, remote_rev_history), set()
1185.54.9 by Aaron Bentley
Added revision-history shortcuts
76
    else:
77
        return None
78
1185.54.10 by Aaron Bentley
Refactored shortcut
79
def _after(larger_history, smaller_history):
80
    return set(larger_history[larger_history.index(smaller_history[-1])+1:])
1185.54.9 by Aaron Bentley
Added revision-history shortcuts
81
82
def _get_history(branch, progress, label, step):
83
    progress.update('%s history' % label, step, 5)
1185.54.7 by Aaron Bentley
More refactoring, handled branches with no commits
84
    rev_history = branch.revision_history()
85
    rev_history_map = dict(
1185.54.9 by Aaron Bentley
Added revision-history shortcuts
86
        [(rev, rev_history.index(rev) + 1)
1185.54.7 by Aaron Bentley
More refactoring, handled branches with no commits
87
         for rev in rev_history])
1185.54.9 by Aaron Bentley
Added revision-history shortcuts
88
    return rev_history, rev_history_map
89
1185.67.1 by Aaron Bentley
Merged the mainline
90
def _get_ancestry(repository, progress, label, step, rev_history):
1185.54.9 by Aaron Bentley
Added revision-history shortcuts
91
    progress.update('%s ancestry' % label, step, 5)
1185.54.7 by Aaron Bentley
More refactoring, handled branches with no commits
92
    if len(rev_history) > 0:
1185.67.1 by Aaron Bentley
Merged the mainline
93
        ancestry = set(repository.get_ancestry(rev_history[-1]))
1185.54.7 by Aaron Bentley
More refactoring, handled branches with no commits
94
    else:
95
        ancestry = set()
1185.54.9 by Aaron Bentley
Added revision-history shortcuts
96
    return ancestry
1185.54.7 by Aaron Bentley
More refactoring, handled branches with no commits
97
    
98
1185.54.4 by Aaron Bentley
Restructured find_unmerged, so it returns lists of (revno, revision) pairs
99
def sorted_revisions(revisions, history_map):
100
    revisions = [(history_map[r],r) for r in revisions]
101
    revisions.sort()
102
    return revisions