← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Martin Pool
  • Date: 2006-02-22 04:29:54 UTC
  • mfrom: (1566 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1569.
  • Revision ID: mbp@sourcefrog.net-20060222042954-60333f08dd56a646
[merge] from bzr.dev before integration
Fix undefined ordering in sign_my_revisions breaking tests

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."""
 
1
"""Display what revisions are missing in 'other' from 'this' and vice verca."""
2
2
 
3
3
import bzrlib.ui as ui
4
4
 
27
27
 
28
28
 
29
29
def find_unmerged(local_branch, remote_branch):
30
 
    progress = ui.ui_factory.nested_progress_bar()
 
30
    progress = ui.ui_factory.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.finished()
 
64
        progress.clear()
65
65
    return (local_extra, remote_extra)
66
66
 
67
67
def _shortcut(local_rev_history, remote_rev_history):