← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Martin Packman
  • Date: 2012-09-05 20:22:17 UTC
  • mfrom: (6437.63.6 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: martin.packman@canonical.com-20120905202217-79io6livc1q0p66u
Merge 2.5 into bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
25
25
import bzrlib.revision as _mod_revision
26
26
 
27
27
 
28
 
def iter_log_revisions(revisions, revision_source, verbose):
 
28
def iter_log_revisions(revisions, revision_source, verbose, rev_tag_dict=None):
29
29
    last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
30
30
    last_rev_id = None
 
31
 
 
32
    if rev_tag_dict is None:
 
33
        rev_tag_dict = {}
31
34
    for rev in revisions:
32
35
        # We need the following for backward compatibilty (hopefully
33
36
        # this will be deprecated soon :-/) -- vila 080911
41
44
            delta = revision_source.get_revision_delta(rev_id)
42
45
        else:
43
46
            delta = None
44
 
        yield log.LogRevision(rev, revno, merge_depth, delta=delta)
 
47
        yield log.LogRevision(rev, revno, merge_depth, delta=delta,
 
48
                              tags=rev_tag_dict.get(rev_id))
45
49
 
46
50
 
47
51
def find_unmerged(local_branch, remote_branch, restrict='all',