/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

More work on roundtrip push support.

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
 
    )
47
44
 
48
45
 
49
46
class MissingObjectsIterator(object):
311
308
 
312
309
    def dfetch_refs(self, update_refs):
313
310
        """Import the gist of the ancestry of a particular revision."""
314
 
        unpeel_map = UnpeelMap.from_repository(self.source)
315
311
        revidmap = {}
316
312
        def determine_wants(old_refs):
317
313
            ret = {}
318
 
            self.old_refs = dict([(k, (v, None)) for (k, v) in old_refs.iteritems()])
 
314
            self.old_refs = old_refs
319
315
            self.new_refs = update_refs(self.old_refs)
320
316
            for name, (gitid, revid) in self.new_refs.iteritems():
321
317
                if gitid is None:
322
 
                    ret[name] = unpeel_map.re_unpeel_tag(self.source_store._lookup_revision_sha1(revid), old_refs.get(name))
 
318
                    ret[name] = self.source_store._lookup_revision_sha1(revid)
323
319
                else:
324
320
                    ret[name] = gitid
325
321
            return ret