← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

first cut at merge from integration.

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
 
 
 
1
"""\
 
2
A plugin for displaying what revisions are in 'other' but not in local.
 
3
"""
 
4
from bzrlib.ui import ui_factory
6
5
def iter_log_data(revisions, revision_source, verbose):
7
6
    from bzrlib.diff import compare_trees
8
7
    from bzrlib.tree import EmptyTree
27
26
 
28
27
 
29
28
def find_unmerged(local_branch, remote_branch):
30
 
    progress = ui.ui_factory.nested_progress_bar()
 
29
    progress = ui_factory.progress_bar()
31
30
    local_branch.lock_read()
32
31
    try:
33
32
        remote_branch.lock_read()
61
60
            remote_branch.unlock()
62
61
    finally:
63
62
        local_branch.unlock()
64
 
        progress.finished()
 
63
        progress.clear()
65
64
    return (local_extra, remote_extra)
66
65
 
67
66
def _shortcut(local_rev_history, remote_rev_history):