/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):
274
271
 
275
272
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
276
273
            fetch_spec=None, mapped_refs=None):
277
 
        if not self.mapping.roundtripping:
278
 
            raise NoPushSupport()
279
274
        if mapped_refs is not None:
280
275
            stop_revisions = mapped_refs
281
276
        elif revision_id is not None:
313
308
 
314
309
    def dfetch_refs(self, update_refs):
315
310
        """Import the gist of the ancestry of a particular revision."""
316
 
        unpeel_map = UnpeelMap.from_repository(self.source)
317
311
        revidmap = {}
318
312
        def determine_wants(old_refs):
319
313
            ret = {}
320
 
            self.old_refs = dict([(k, (v, None)) for (k, v) in old_refs.iteritems()])
 
314
            self.old_refs = old_refs
321
315
            self.new_refs = update_refs(self.old_refs)
322
316
            for name, (gitid, revid) in self.new_refs.iteritems():
323
317
                if gitid is None:
324
 
                    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)
325
319
                else:
326
320
                    ret[name] = gitid
327
321
            return ret