← 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-09-06 12:20:16 UTC
  • mfrom: (1551.8.23 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20060906122016-54ab3159023ef544
Improve conflict message for deleting directories with contents

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 verca."""
 
1
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
2
2
 
3
3
import bzrlib.ui as ui
4
4
 
5
5
 
6
6
def iter_log_data(revisions, revision_source, verbose):
7
 
    from bzrlib.diff import compare_trees
8
 
    from bzrlib.tree import EmptyTree
9
 
    last_tree = EmptyTree
 
7
    last_tree = revision_source.revision_tree(None)
10
8
    last_rev_id = None
11
9
    for revno, rev_id in revisions:
12
10
        rev = revision_source.get_revision(rev_id)
20
18
            revision_tree = revision_source.revision_tree(rev_id)
21
19
            last_rev_id = rev_id
22
20
            last_tree = revision_tree
23
 
            delta = compare_trees(revision_tree, parent_tree)
 
21
            delta = parent_tree.changes_from(revision_tree)
24
22
        else:
25
23
            delta = None
26
24
        yield revno, rev, delta