← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: John Arbash Meinel
  • Date: 2007-11-13 20:37:09 UTC
  • mto: This revision was merged to the branch mainline in revision 3001.
  • Revision ID: john@arbash-meinel.com-20071113203709-kysdte0emqv84pnj
https://launchpad.net/bugs/162486
Fix bug #162486, by having RemoteBranch properly initialize self._revision_id_to_revno_map.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
1
 
"""\
2
 
A plugin for displaying what revisions are in 'other' but not in local.
3
 
"""
4
 
from bzrlib.ui import ui_factory
 
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
from bzrlib.symbol_versioning import (
 
24
    deprecated_function,
 
25
    zero_seventeen,
 
26
    )
 
27
 
 
28
 
 
29
@deprecated_function(zero_seventeen)
5
30
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
 
31
    for revision in iter_log_revisions(revisions, revision_source, verbose):
 
32
        yield revision.revno, revision.rev, revision.delta
 
33
 
 
34
 
 
35
def iter_log_revisions(revisions, revision_source, verbose):
 
36
    last_tree = revision_source.revision_tree(None)
9
37
    last_rev_id = None
10
38
    for revno, rev_id in revisions:
11
39
        rev = revision_source.get_revision(rev_id)
12
40
        if verbose:
 
41
            remote_tree = revision_source.revision_tree(rev_id)
13
42
            parent_rev_id = rev.parent_ids[0]
14
43
            if last_rev_id == parent_rev_id:
15
44
                parent_tree = last_tree
18
47
            revision_tree = revision_source.revision_tree(rev_id)
19
48
            last_rev_id = rev_id
20
49
            last_tree = revision_tree
21
 
            delta = compare_trees(revision_tree, parent_tree)
 
50
            delta = revision_tree.changes_from(parent_tree)
22
51
        else:
23
52
            delta = None
24
 
        yield revno, rev, delta
 
53
        yield LogRevision(rev, revno, delta=delta)
25
54
 
26
55
 
27
56
def find_unmerged(local_branch, remote_branch):
28
 
    progress = ui_factory.progress_bar()
 
57
    progress = ui.ui_factory.nested_progress_bar()
29
58
    local_branch.lock_read()
30
59
    try:
31
60
        remote_branch.lock_read()
43
72
                                                remote_rev_history_map)
44
73
                return local_extra, remote_extra
45
74
 
46
 
            local_ancestry = _get_ancestry(local_branch, progress, "local",
47
 
                                           2, local_rev_history)
48
 
            remote_ancestry = _get_ancestry(remote_branch, progress, "remote",
49
 
                                            3, remote_rev_history)
 
75
            local_ancestry = _get_ancestry(local_branch.repository, progress, 
 
76
                                           "local", 2, local_rev_history)
 
77
            remote_ancestry = _get_ancestry(remote_branch.repository, progress,
 
78
                                            "remote", 3, remote_rev_history)
50
79
            progress.update('pondering', 4, 5)
51
80
            extras = local_ancestry.symmetric_difference(remote_ancestry) 
52
81
            local_extra = extras.intersection(set(local_rev_history))
59
88
            remote_branch.unlock()
60
89
    finally:
61
90
        local_branch.unlock()
62
 
        progress.clear()
 
91
        progress.finished()
63
92
    return (local_extra, remote_extra)
64
93
 
65
94
def _shortcut(local_rev_history, remote_rev_history):
87
116
         for rev in rev_history])
88
117
    return rev_history, rev_history_map
89
118
 
90
 
def _get_ancestry(branch, progress, label, step, rev_history):
 
119
def _get_ancestry(repository, progress, label, step, rev_history):
91
120
    progress.update('%s ancestry' % label, step, 5)
92
121
    if len(rev_history) > 0:
93
 
        ancestry = set(branch.get_ancestry(rev_history[-1]))
 
122
        ancestry = set(repository.get_ancestry(rev_history[-1],
 
123
                       topo_sorted=False))
94
124
    else:
95
125
        ancestry = set()
96
126
    return ancestry