← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-08 00:37:41 UTC
  • mfrom: (1594.2.4 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060308003741-08afccbf89005e87
Merge in :
 * Knit repositories use knits
 * Nested progress bar support.
 * Ghost aware graph api.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
27
27
 
28
28
 
29
29
def find_unmerged(local_branch, remote_branch):
30
 
    progress = ui.ui_factory.progress_bar()
 
30
    progress = ui.ui_factory.nested_progress_bar()
31
31
    local_branch.lock_read()
32
32
    try:
33
33
        remote_branch.lock_read()
61
61
            remote_branch.unlock()
62
62
    finally:
63
63
        local_branch.unlock()
64
 
        progress.clear()
 
64
        progress.finished()
65
65
    return (local_extra, remote_extra)
66
66
 
67
67
def _shortcut(local_rev_history, remote_rev_history):