/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 breezy/git/server.py

Fix compatibility with newer Dulwich.

Merged from https://code.launchpad.net/~jelmer/brz/new-git/+merge/383480

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/server.py
92
92
            have = self.object_store.find_common_revisions(graph_walker)
93
93
            if wants is None:
94
94
                return
 
95
            shallows = getattr(graph_walker, 'shallow', frozenset())
95
96
            if isinstance(self.object_store, BazaarObjectStore):
96
97
                return self.object_store.generate_pack_contents(
97
 
                    have, wants, progress, get_tagged=get_tagged, lossy=True)
 
98
                    have, wants, shallow=shallows,
 
99
                    progress=progress, get_tagged=get_tagged, lossy=True)
98
100
            else:
99
 
                return self.object_store.generate_pack_contents(
100
 
                    have, wants, progress)
 
101
                if shallows:
 
102
                    return self.object_store.generate_pack_contents(
 
103
                        have, wants, shallow=shallows, progress=progress)
 
104
                else:
 
105
                    return self.object_store.generate_pack_contents(
 
106
                        have, wants, progress=progress)
 
107
 
101
108
 
102
109
 
103
110
class BzrTCPGitServer(TCPGitServer):