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

Default to using global user id rather than making one up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
17
17
import os
18
18
import tempfile
19
19
 
20
 
from dulwich.server import TCPGitServer
21
 
import os
22
 
 
23
20
from bzrlib.bzrdir import (
24
21
    BzrDir,
25
 
    BzrDirFormat,
26
22
    )
27
23
from bzrlib.repository import (
28
24
    Repository,
51
47
 
52
48
class BzrBackend(Backend):
53
49
 
54
 
    def __init__(self, transport):
55
 
        self.transport = transport
 
50
    def __init__(self, directory):
 
51
        self.directory = directory
56
52
        self.mapping = default_mapping
57
53
 
58
54
    def get_refs(self):
59
55
        """ return a dict of all tags and branches in repository (and shas) """
60
56
        ret = {}
61
 
        repo_dir = BzrDir.open_from_transport(self.transport)
62
 
        repo = repo_dir.find_repository()
63
 
        repo.lock_read()
64
 
        try:
65
 
            store = get_object_store(repo)
66
 
            branch = None
67
 
            for branch in repo.find_branches(using=True):
68
 
                #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
69
 
                #FIXME: Need to get branch path relative to its repository and use this instead of nick
70
 
                ret["refs/heads/"+branch.nick] = store._lookup_revision_sha1(branch.last_revision())
71
 
            if 'HEAD' not in ret and branch:
72
 
                ret['HEAD'] = store._lookup_revision_sha1(branch.last_revision())
73
 
        finally:
74
 
            repo.unlock()
 
57
        repo_dir = BzrDir.open(self.directory)
 
58
        repo = repo_dir.open_repository()
 
59
        store = get_object_store(repo)
 
60
        branch = None
 
61
        for branch in repo.find_branches(using=True):
 
62
            #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
 
63
            #FIXME: Need to get branch path relative to its repository and use this instead of nick
 
64
            ret["refs/heads/"+branch.nick] = store._lookup_revision_sha1(branch.last_revision())
 
65
        if 'HEAD' not in ret and branch:
 
66
            ret['HEAD'] = store._lookup_revision_sha1(branch.last_revision())
75
67
        return ret
76
68
 
77
69
    def apply_pack(self, refs, read):
91
83
            for obj in pack.iterobjects():
92
84
                yield obj
93
85
 
94
 
        target = Repository.open_from_transport(self.transport)
 
86
        target = Repository.open(self.directory)
95
87
 
96
88
        target.lock_write()
97
89
        try:
106
98
        for oldsha, sha, ref in refs:
107
99
            if ref[:11] == 'refs/heads/':
108
100
                branch_nick = ref[11:]
109
 
                transport = self.transport.clone(branch_nick)
110
101
 
111
102
                try:
112
 
                    target_dir = BzrDir.open_from_transport(transport)
 
103
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
113
104
                except:
114
 
                    format = BzrDirFormat.get_default_format()
115
 
                    format.initialize_on_transport(transport)
 
105
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
116
106
 
117
107
                try:
118
108
                    target_branch = target_dir.open_branch()
124
114
 
125
115
    def fetch_objects(self, determine_wants, graph_walker, progress):
126
116
        """ yield git objects to send to client """
127
 
        bzrdir = BzrDir.open_from_transport(self.transport)
128
 
        repo = bzrdir.find_repository()
 
117
        repo = Repository.open(self.directory)
129
118
 
130
119
        # If this is a Git repository, just use the existing fetch_objects implementation.
131
120
        if getattr(repo, "fetch_objects", None) is not None:
132
121
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
133
122
 
134
123
        wants = determine_wants(self.get_refs())
 
124
 
135
125
        repo.lock_read()
136
 
        store = BazaarObjectStore(repo)
137
 
        have = store.find_common_revisions(graph_walker)
138
 
        missing_sha1s = store.find_missing_objects(have, wants, progress)
139
 
        return store.iter_shas(missing_sha1s)
140
 
 
141
 
 
142
 
def serve_git(transport, host=None, port=None, inet=False):
143
 
    backend = BzrBackend(transport)
144
 
 
145
 
    server = TCPGitServer(backend, 'localhost')
146
 
    server.serve_forever()
 
126
        try:
 
127
            store = BazaarObjectStore(repo)
 
128
            have = store.find_missing_revisions(graph_walker)
 
129
            missing_sha1s = store.find_missing_objects(have, wants, progress)
 
130
            return self.object_store.iter_shas(missing_sha1s)
 
131
        finally:
 
132
            repo.unlock()