/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

Fix teardown of object store tests.

Show diffs side-by-side

added added

removed removed

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