/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

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

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