← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Jelmer Vernooij
  • Date: 2009-02-23 20:55:58 UTC
  • mfrom: (4034 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4053.
  • Revision ID: jelmer@samba.org-20090223205558-1cx2k4w1zgs8r5qa
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
37
37
            revno, rev_id, merge_depth = rev
38
38
        rev = revision_source.get_revision(rev_id)
39
39
        if verbose:
40
 
            remote_tree = revision_source.revision_tree(rev_id)
41
 
            parent_rev_id = rev.parent_ids[0]
42
 
            if last_rev_id == parent_rev_id:
43
 
                parent_tree = last_tree
44
 
            else:
45
 
                parent_tree = revision_source.revision_tree(parent_rev_id)
46
 
            revision_tree = revision_source.revision_tree(rev_id)
47
 
            last_rev_id = rev_id
48
 
            last_tree = revision_tree
49
 
            delta = revision_tree.changes_from(parent_tree)
 
40
            delta = revision_source.get_revision_delta(rev_id)
50
41
        else:
51
42
            delta = None
52
43
        yield log.LogRevision(rev, revno, merge_depth, delta=delta)
99
90
    :param tip_revno: The revision number for the tip revision
100
91
    :param tip: The tip of mainline
101
92
    :param backward: Show oldest versions first when True, newest versions
102
 
        first when False. 
 
93
        first when False.
103
94
    :return: [(revno, revision_id)] for all revisions in ancestry that
104
95
        are left-hand parents from tip, or None if ancestry is None.
105
96
    """
138
129
    :param tip_revno: The revision number for the tip revision
139
130
    :param tip: The tip of the ancsetry
140
131
    :param backward: Show oldest versions first when True, newest versions
141
 
        first when False. 
 
132
        first when False.
142
133
    :return: [(revno, revision_id)] for all revisions in ancestry that
143
134
        are parents from tip, or None if ancestry is None.
144
135
    """
161
152
    parent_map = dict(((key, value) for key, value
162
153
                       in graph.iter_ancestry(mainline_revs[1:])
163
154
                       if value is not None))
164
 
    # filter out ghosts; merge_sort errors on ghosts. 
 
155
    # filter out ghosts; merge_sort errors on ghosts.
165
156
    # XXX: is this needed here ? -- vila080910
166
157
    rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
167
158
    # XXX: what if rev_graph is empty now ? -- vila080910