← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Robert Collins
  • Date: 2007-03-08 04:06:06 UTC
  • mfrom: (2323.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070308040606-84gsniv56huiyjt4
Merge bzr.dev.

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
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
2
18
 
3
19
import bzrlib.ui as ui
4
20
 
5
21
 
6
22
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
 
23
    last_tree = revision_source.revision_tree(None)
10
24
    last_rev_id = None
11
25
    for revno, rev_id in revisions:
12
26
        rev = revision_source.get_revision(rev_id)
20
34
            revision_tree = revision_source.revision_tree(rev_id)
21
35
            last_rev_id = rev_id
22
36
            last_tree = revision_tree
23
 
            delta = compare_trees(revision_tree, parent_tree)
 
37
            delta = revision_tree.changes_from(parent_tree)
24
38
        else:
25
39
            delta = None
26
40
        yield revno, rev, delta