/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

Merge John.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os
18
 
import tempfile
19
 
 
20
 
from dulwich.server import TCPGitServer
21
 
import os
22
 
 
23
 
from bzrlib.bzrdir import (
24
 
    BzrDir,
25
 
    BzrDirFormat,
26
 
    )
27
 
from bzrlib.repository import (
28
 
    Repository,
29
 
    )
30
 
 
31
 
from bzrlib.plugins.git.fetch import (
32
 
    import_git_objects,
33
 
    BazaarObjectStore,
34
 
    )
35
 
from bzrlib.plugins.git.mapping import (
36
 
    default_mapping,
37
 
    )
38
 
from bzrlib.plugins.git.object_store import (
39
 
    get_object_store
40
 
    )
41
 
 
42
 
from dulwich.server import (
43
 
    Backend,
44
 
    )
45
 
from dulwich.pack import (
46
 
    Pack,
47
 
    PackData,
48
 
    write_pack_index_v2,
49
 
    )
50
 
 
 
17
from bzrlib.bzrdir import BzrDir
 
18
from bzrlib.repository import Repository
 
19
 
 
20
from bzrlib.plugins.git.fetch import import_git_objects
 
21
from bzrlib.plugins.git.mapping import default_mapping
 
22
 
 
23
from dulwich.server import Backend
 
24
from dulwich.pack import Pack, PackData, write_pack_index_v2
 
25
from dulwich.objects import ShaFile
 
26
 
 
27
import os, tempfile
51
28
 
52
29
class BzrBackend(Backend):
53
30
 
54
 
    def __init__(self, transport):
55
 
        self.transport = transport
 
31
    def __init__(self, directory):
 
32
        self.directory = directory
56
33
        self.mapping = default_mapping
57
34
 
58
35
    def get_refs(self):
59
36
        """ return a dict of all tags and branches in repository (and shas) """
60
 
        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()
75
 
        return ret
 
37
        return {}
76
38
 
77
39
    def apply_pack(self, refs, read):
78
40
        """ apply pack from client to current repository """
91
53
            for obj in pack.iterobjects():
92
54
                yield obj
93
55
 
94
 
        target = Repository.open_from_transport(self.transport)
 
56
        target = Repository.open(self.directory)
95
57
 
96
58
        target.lock_write()
97
59
        try:
106
68
        for oldsha, sha, ref in refs:
107
69
            if ref[:11] == 'refs/heads/':
108
70
                branch_nick = ref[11:]
109
 
                transport = self.transport.clone(branch_nick)
110
71
 
111
72
                try:
112
 
                    target_dir = BzrDir.open_from_transport(transport)
 
73
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
113
74
                except:
114
 
                    format = BzrDirFormat.get_default_format()
115
 
                    format.initialize_on_transport(transport)
 
75
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
116
76
 
117
77
                try:
118
78
                    target_branch = target_dir.open_branch()
119
79
                except:
120
80
                    target_branch = target_dir.create_branch()
121
 
 
 
81
               
122
82
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
123
 
                target_branch.generate_revision_history(rev_id)
 
83
                target_branch.generate_revision_history(rev_id) 
124
84
 
125
85
    def fetch_objects(self, determine_wants, graph_walker, progress):
126
86
        """ yield git objects to send to client """
127
 
        bzrdir = BzrDir.open_from_transport(self.transport)
128
 
        repo = bzrdir.find_repository()
129
 
 
130
 
        # If this is a Git repository, just use the existing fetch_objects implementation.
131
 
        if getattr(repo, "fetch_objects", None) is not None:
132
 
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
133
 
 
134
 
        wants = determine_wants(self.get_refs())
135
 
        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()
 
87