/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/missing.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
 
31
31
    if rev_tag_dict is None:
32
32
        rev_tag_dict = {}
33
 
    for rev in revisions:
34
 
        # We need the following for backward compatibilty (hopefully
35
 
        # this will be deprecated soon :-/) -- vila 080911
36
 
        if len(rev) == 2:
37
 
            revno, rev_id = rev
38
 
            merge_depth = 0
39
 
        else:
40
 
            revno, rev_id, merge_depth = rev
 
33
    for revno, rev_id, merge_depth in revisions:
41
34
        rev = revision_source.get_revision(rev_id)
42
35
        if verbose:
43
36
            delta = revision_source.get_revision_delta(rev_id)
97
90
    :param tip: The tip of mainline
98
91
    :param backward: Show oldest versions first when True, newest versions
99
92
        first when False.
100
 
    :return: [(revno, revision_id)] for all revisions in ancestry that
 
93
    :return: [(revno, revision_id, 0)] for all revisions in ancestry that
101
94
        are left-hand parents from tip, or None if ancestry is None.
102
95
    """
103
96
    if ancestry is None:
117
110
        parents = parent_map.get(cur)
118
111
        if not parents:
119
112
            break # Ghost, we are done
120
 
        mainline.append((str(cur_revno), cur))
 
113
        mainline.append((str(cur_revno), cur, 0))
121
114
        cur = parents[0]
122
115
        cur_revno -= 1
123
116
    if not backward: