← 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-03-06 11:20:10 UTC
  • mfrom: (1593 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1611.
  • Revision ID: mbp@sourcefrog.net-20060306112010-17c0170dde5d1eea
[merge] large merge to sync with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
1
 
"""\
2
 
A plugin for displaying what revisions are in 'other' but not in local.
3
 
"""
4
 
from bzrlib.ui import ui_factory
 
1
"""Display what revisions are missing in 'other' from 'this' and vice verca."""
 
2
 
 
3
import bzrlib.ui as ui
 
4
 
 
5
 
5
6
def iter_log_data(revisions, revision_source, verbose):
6
7
    from bzrlib.diff import compare_trees
7
8
    from bzrlib.tree import EmptyTree
26
27
 
27
28
 
28
29
def find_unmerged(local_branch, remote_branch):
29
 
    progress = ui_factory.progress_bar()
 
30
    progress = ui.ui_factory.progress_bar()
30
31
    local_branch.lock_read()
31
32
    try:
32
33
        remote_branch.lock_read()