/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Robert Collins
  • Date: 2006-03-03 02:09:49 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060303020949-0ddc6f33d0a43943
Smoke test for RevisionStore factories creating revision stores.

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.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):