← 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-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
 
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
 
1
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
2
18
 
3
 
import bzrlib.ui as ui
4
 
 
5
 
 
 
19
from bzrlib import ui
 
20
from bzrlib.log import (
 
21
    LogRevision,
 
22
    )
 
23
from bzrlib.symbol_versioning import (
 
24
    deprecated_function,
 
25
    zero_seventeen,
 
26
    )
 
27
 
 
28
 
 
29
@deprecated_function(zero_seventeen)
6
30
def iter_log_data(revisions, revision_source, verbose):
 
31
    for revision in iter_log_revisions(revisions, revision_source, verbose):
 
32
        yield revision.revno, revision.rev, revision.delta
 
33
 
 
34
 
 
35
def iter_log_revisions(revisions, revision_source, verbose):
7
36
    last_tree = revision_source.revision_tree(None)
8
37
    last_rev_id = None
9
38
    for revno, rev_id in revisions:
18
47
            revision_tree = revision_source.revision_tree(rev_id)
19
48
            last_rev_id = rev_id
20
49
            last_tree = revision_tree
21
 
            delta = parent_tree.changes_from(revision_tree)
 
50
            delta = revision_tree.changes_from(parent_tree)
22
51
        else:
23
52
            delta = None
24
 
        yield revno, rev, delta
 
53
        yield LogRevision(rev, revno, delta=delta)
25
54
 
26
55
 
27
56
def find_unmerged(local_branch, remote_branch):
90
119
def _get_ancestry(repository, progress, label, step, rev_history):
91
120
    progress.update('%s ancestry' % label, step, 5)
92
121
    if len(rev_history) > 0:
93
 
        ancestry = set(repository.get_ancestry(rev_history[-1]))
 
122
        ancestry = set(repository.get_ancestry(rev_history[-1],
 
123
                       topo_sorted=False))
94
124
    else:
95
125
        ancestry = set()
96
126
    return ancestry