/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Ian Clatworthy
  • Date: 2008-06-06 11:55:58 UTC
  • mto: (3480.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3481.
  • Revision ID: ian.clatworthy@canonical.com-20080606115558-qw0kh7p3dl1o6o9s
tweaks requested by jam & poolie during review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
 
18
 
 
19
from bzrlib import ui
 
20
from bzrlib.log import (
 
21
    LogRevision,
 
22
    )
 
23
 
 
24
 
 
25
def iter_log_revisions(revisions, revision_source, verbose):
 
26
    last_tree = revision_source.revision_tree(None)
 
27
    last_rev_id = None
 
28
    for revno, rev_id in revisions:
 
29
        rev = revision_source.get_revision(rev_id)
 
30
        if verbose:
 
31
            remote_tree = revision_source.revision_tree(rev_id)
 
32
            parent_rev_id = rev.parent_ids[0]
 
33
            if last_rev_id == parent_rev_id:
 
34
                parent_tree = last_tree
 
35
            else:
 
36
                parent_tree = revision_source.revision_tree(parent_rev_id)
 
37
            revision_tree = revision_source.revision_tree(rev_id)
 
38
            last_rev_id = rev_id
 
39
            last_tree = revision_tree
 
40
            delta = revision_tree.changes_from(parent_tree)
 
41
        else:
 
42
            delta = None
 
43
        yield LogRevision(rev, revno, delta=delta)
 
44
 
 
45
 
 
46
def find_unmerged(local_branch, remote_branch):
 
47
    progress = ui.ui_factory.nested_progress_bar()
 
48
    local_branch.lock_read()
 
49
    try:
 
50
        remote_branch.lock_read()
 
51
        try:
 
52
            # check for special case: both branches are equivalent
 
53
            if (local_branch.last_revision_info() ==
 
54
                remote_branch.last_revision_info()):
 
55
                return [], []
 
56
            local_rev_history, local_rev_history_map = \
 
57
                _get_history(local_branch, progress, "local", 0)
 
58
            remote_rev_history, remote_rev_history_map = \
 
59
                _get_history(remote_branch, progress, "remote", 1)
 
60
            result = _shortcut(local_rev_history, remote_rev_history)
 
61
            if result is not None:
 
62
                local_extra, remote_extra = result
 
63
                local_extra = sorted_revisions(local_extra, 
 
64
                                               local_rev_history_map)
 
65
                remote_extra = sorted_revisions(remote_extra, 
 
66
                                                remote_rev_history_map)
 
67
                return local_extra, remote_extra
 
68
 
 
69
            local_ancestry = _get_ancestry(local_branch.repository, progress, 
 
70
                                           "local", 2, local_rev_history)
 
71
            remote_ancestry = _get_ancestry(remote_branch.repository, progress,
 
72
                                            "remote", 3, remote_rev_history)
 
73
            progress.update('pondering', 4, 5)
 
74
            extras = local_ancestry.symmetric_difference(remote_ancestry) 
 
75
            local_extra = extras.intersection(set(local_rev_history))
 
76
            remote_extra = extras.intersection(set(remote_rev_history))
 
77
            local_extra = sorted_revisions(local_extra, local_rev_history_map)
 
78
            remote_extra = sorted_revisions(remote_extra, 
 
79
                                            remote_rev_history_map)
 
80
                    
 
81
        finally:
 
82
            remote_branch.unlock()
 
83
    finally:
 
84
        local_branch.unlock()
 
85
        progress.finished()
 
86
    return (local_extra, remote_extra)
 
87
 
 
88
def _shortcut(local_rev_history, remote_rev_history):
 
89
    local_history = set(local_rev_history)
 
90
    remote_history = set(remote_rev_history)
 
91
    if len(local_rev_history) == 0:
 
92
        return set(), remote_history
 
93
    elif len(remote_rev_history) == 0:
 
94
        return local_history, set()
 
95
    elif local_rev_history[-1] in remote_history:
 
96
        return set(), _after(remote_rev_history, local_rev_history)
 
97
    elif remote_rev_history[-1] in local_history:
 
98
        return _after(local_rev_history, remote_rev_history), set()
 
99
    else:
 
100
        return None
 
101
 
 
102
def _after(larger_history, smaller_history):
 
103
    return set(larger_history[larger_history.index(smaller_history[-1])+1:])
 
104
 
 
105
def _get_history(branch, progress, label, step):
 
106
    progress.update('%s history' % label, step, 5)
 
107
    rev_history = branch.revision_history()
 
108
    rev_history_map = dict(
 
109
        [(rev, rev_history.index(rev) + 1)
 
110
         for rev in rev_history])
 
111
    return rev_history, rev_history_map
 
112
 
 
113
def _get_ancestry(repository, progress, label, step, rev_history):
 
114
    progress.update('%s ancestry' % label, step, 5)
 
115
    if len(rev_history) > 0:
 
116
        ancestry = set(repository.get_ancestry(rev_history[-1],
 
117
                       topo_sorted=False))
 
118
    else:
 
119
        ancestry = set()
 
120
    return ancestry
 
121
    
 
122
 
 
123
def sorted_revisions(revisions, history_map):
 
124
    revisions = [(history_map[r],r) for r in revisions]
 
125
    revisions.sort()
 
126
    return revisions