← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Patch Queue Manager
  • Date: 2016-02-01 19:13:13 UTC
  • mfrom: (6614.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201191313-wdfvmfff1djde6oq
(vila) Release 2.7.0 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
16
16
 
17
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from bzrlib import (
20
22
    log,
21
23
    symbol_versioning,
23
25
import bzrlib.revision as _mod_revision
24
26
 
25
27
 
26
 
def iter_log_revisions(revisions, revision_source, verbose):
 
28
def iter_log_revisions(revisions, revision_source, verbose, rev_tag_dict=None):
27
29
    last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
28
30
    last_rev_id = None
 
31
 
 
32
    if rev_tag_dict is None:
 
33
        rev_tag_dict = {}
29
34
    for rev in revisions:
30
35
        # We need the following for backward compatibilty (hopefully
31
36
        # this will be deprecated soon :-/) -- vila 080911
39
44
            delta = revision_source.get_revision_delta(rev_id)
40
45
        else:
41
46
            delta = None
42
 
        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))
43
49
 
44
50
 
45
51
def find_unmerged(local_branch, remote_branch, restrict='all',