/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 git -> git fetching.

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
    NULL_REVISION,
34
34
    )
35
35
 
36
 
from bzrlib.plugins.git.converter import (
37
 
    BazaarObjectStore,
38
 
    )
39
36
from bzrlib.plugins.git.errors import (
40
37
    NoPushSupport,
41
38
    )
 
39
from bzrlib.plugins.git.object_store import (
 
40
    BazaarObjectStore,
 
41
    )
42
42
from bzrlib.plugins.git.repository import (
43
43
    GitRepository,
44
44
    LocalGitRepository,
221
221
        try:
222
222
            store = BazaarObjectStore(self.source, self.mapping)
223
223
            def generate_blob_contents(have, want):
224
 
                graphwalker = SimpleFetchGraphWalker(have, store.get_parents)
 
224
                graphwalker = SimpleFetchGraphWalker(want, store.get_parents)
 
225
                for h in have:
 
226
                    graphwalker.ack(h)
225
227
                return store.find_missing_objects(want, graphwalker)
226
228
            new_refs = self.target.send_pack(determine_wants, generate_blob_contents)
227
229
        finally: