← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

Add source index to the index iteration API to allow mapping back to the origin of retrieved data.

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 verca."""
2
 
 
3
 
import bzrlib.ui as ui
4
 
 
5
 
 
 
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)
6
30
def iter_log_data(revisions, revision_source, verbose):
7
 
    from bzrlib.diff import compare_trees
8
 
    from bzrlib.tree import EmptyTree
9
 
    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)
10
37
    last_rev_id = None
11
38
    for revno, rev_id in revisions:
12
39
        rev = revision_source.get_revision(rev_id)
20
47
            revision_tree = revision_source.revision_tree(rev_id)
21
48
            last_rev_id = rev_id
22
49
            last_tree = revision_tree
23
 
            delta = compare_trees(revision_tree, parent_tree)
 
50
            delta = revision_tree.changes_from(parent_tree)
24
51
        else:
25
52
            delta = None
26
 
        yield revno, rev, delta
 
53
        yield LogRevision(rev, revno, delta=delta)
27
54
 
28
55
 
29
56
def find_unmerged(local_branch, remote_branch):
30
 
    progress = ui.ui_factory.progress_bar()
 
57
    progress = ui.ui_factory.nested_progress_bar()
31
58
    local_branch.lock_read()
32
59
    try:
33
60
        remote_branch.lock_read()
61
88
            remote_branch.unlock()
62
89
    finally:
63
90
        local_branch.unlock()
64
 
        progress.clear()
 
91
        progress.finished()
65
92
    return (local_extra, remote_extra)
66
93
 
67
94
def _shortcut(local_rev_history, remote_rev_history):
92
119
def _get_ancestry(repository, progress, label, step, rev_history):
93
120
    progress.update('%s ancestry' % label, step, 5)
94
121
    if len(rev_history) > 0:
95
 
        ancestry = set(repository.get_ancestry(rev_history[-1]))
 
122
        ancestry = set(repository.get_ancestry(rev_history[-1],
 
123
                       topo_sorted=False))
96
124
    else:
97
125
        ancestry = set()
98
126
    return ancestry