← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2012-04-11 02:22:42 UTC
  • mto: This revision was merged to the branch mainline in revision 6521.
  • Revision ID: nmb@wartburg.edu-20120411022242-ipigxsc6v6bnxnji
pass in tag dictionary instead of branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
5002
5002
                             "You have %d extra revisions:\n", 
5003
5003
                             len(local_extra)) %
5004
5004
                len(local_extra))
 
5005
            rev_tag_dict = {}
 
5006
            if local_branch.supports_tags():
 
5007
                rev_tag_dict = local_branch.tags.get_reverse_tag_dict()
5005
5008
            for revision in iter_log_revisions(local_extra,
5006
5009
                                local_branch.repository,
5007
5010
                                verbose,
5008
 
                                local_branch):
 
5011
                                rev_tag_dict):
5009
5012
                lf.log_revision(revision)
5010
5013
            printed_local = True
5011
5014
            status_code = 1
5019
5022
                             "You are missing %d revisions:\n",
5020
5023
                             len(remote_extra)) %
5021
5024
                len(remote_extra))
 
5025
            if remote_branch.supports_tags():
 
5026
                rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
5022
5027
            for revision in iter_log_revisions(remote_extra,
5023
5028
                                remote_branch.repository,
5024
 
                                verbose):
 
5029
                                verbose,
 
5030
                                rev_tag_dict):
5025
5031
                lf.log_revision(revision)
5026
5032
            status_code = 1
5027
5033