/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to push.py

https://launchpad.net/bugs/675231
Don't peel tags automatically when pushing back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
42
42
    RemoteGitRepository,
43
43
    )
44
44
from bzrlib.plugins.git.refs import (
45
 
    get_unpeel_map,
 
45
    UnpeelMap,
46
46
    )
47
47
 
48
48
 
311
311
 
312
312
    def dfetch_refs(self, update_refs):
313
313
        """Import the gist of the ancestry of a particular revision."""
314
 
        unpeel_map = get_unpeel_map(self.source)
 
314
        unpeel_map = UnpeelMap.from_repository(self.source)
315
315
        revidmap = {}
316
316
        def determine_wants(old_refs):
317
317
            ret = {}
319
319
            self.new_refs = update_refs(self.old_refs)
320
320
            for name, (gitid, revid) in self.new_refs.iteritems():
321
321
                if gitid is None:
322
 
                    ret[name] = unpeel_map.re_unpeel_tag(self.source_store._lookup_revision_sha1(revid), old_refs[name])
 
322
                    ret[name] = unpeel_map.re_unpeel_tag(self.source_store._lookup_revision_sha1(revid), old_refs.get(name))
323
323
                else:
324
324
                    ret[name] = gitid
325
325
            return ret