← Back to branch summary

~bialix/bzr/2.0-bug-523069

« back to all changes in this revision

Viewing changes to bzrlib/tag.py

  • Committer: Johan Walles
  • Date: 2009-05-06 05:36:28 UTC
  • mfrom: (4332 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090506053628-tbf1wz4a0m9t684g
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tag.py
67
67
        # we never have anything to copy
68
68
        pass
69
69
 
 
70
    def rename_revisions(self, rename_map):
 
71
        # No tags, so nothing to rename
 
72
        pass
 
73
 
70
74
    def get_reverse_tag_dict(self):
71
75
        # There aren't any tags, so the reverse mapping is empty.
72
76
        return {}
216
220
            to_tags.branch.unlock()
217
221
        return conflicts
218
222
 
 
223
    def rename_revisions(self, rename_map):
 
224
        """Rename revisions in this tags dictionary.
 
225
        
 
226
        :param rename_map: Dictionary mapping old revids to new revids
 
227
        """
 
228
        reverse_tags = self.get_reverse_tag_dict()
 
229
        for revid, names in reverse_tags.iteritems():
 
230
            if revid in rename_map:
 
231
                for name in names:
 
232
                    self.set_tag(name, rename_map[revid])
 
233
 
219
234
    def _reconcile_tags(self, source_dict, dest_dict, overwrite):
220
235
        """Do a two-way merge of two tag dictionaries.
221
236