/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/server.py
16
16
# along with this program; if not, write to the Free Software
17
17
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
from dulwich.server import TCPGitServer
22
20
 
23
21
import sys
92
90
            have = self.object_store.find_common_revisions(graph_walker)
93
91
            if wants is None:
94
92
                return
 
93
            shallows = getattr(graph_walker, 'shallow', frozenset())
95
94
            if isinstance(self.object_store, BazaarObjectStore):
96
95
                return self.object_store.generate_pack_contents(
97
 
                    have, wants, progress, get_tagged=get_tagged, lossy=True)
 
96
                    have, wants, shallow=shallows,
 
97
                    progress=progress, get_tagged=get_tagged, lossy=True)
98
98
            else:
99
 
                return self.object_store.generate_pack_contents(
100
 
                    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
 
101
106
 
102
107
 
103
108
class BzrTCPGitServer(TCPGitServer):