/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

https://launchpad.net/bugs/445156
Unquote paths extracted from URLs.

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
 
from bzrlib.bzrdir import BzrDir
18
 
from bzrlib.repository import Repository
19
 
from bzrlib.inventory import InventoryDirectory, InventoryFile
20
 
from bzrlib.osutils import splitpath
21
 
 
22
 
from bzrlib.plugins.git.fetch import import_git_objects
23
 
from bzrlib.plugins.git.mapping import default_mapping, revision_to_commit, inventory_to_tree_and_blobs
24
 
 
25
 
from dulwich.server import Backend
26
 
from dulwich.pack import Pack, PackData, write_pack_index_v2
27
 
from dulwich.objects import ShaFile, Commit, Tree, Blob
28
 
 
29
 
import os, tempfile
30
 
 
31
 
import stat
32
 
S_IFGITLINK = 0160000
33
 
 
34
 
#S_IFREG | 0664 # *Might* see this; would fail fsck --strict
35
 
 
 
17
import os
 
18
import tempfile
 
19
 
 
20
from dulwich.server import TCPGitServer
 
21
 
 
22
from bzrlib.bzrdir import (
 
23
    BzrDir,
 
24
    BzrDirFormat,
 
25
    )
 
26
from bzrlib.repository import (
 
27
    Repository,
 
28
    )
 
29
 
 
30
from bzrlib.plugins.git.fetch import (
 
31
    import_git_objects,
 
32
    BazaarObjectStore,
 
33
    )
 
34
from bzrlib.plugins.git.mapping import (
 
35
    default_mapping,
 
36
    )
 
37
from bzrlib.plugins.git.object_store import (
 
38
    get_object_store
 
39
    )
 
40
 
 
41
from dulwich.server import (
 
42
    Backend,
 
43
    )
 
44
from dulwich.pack import (
 
45
    Pack,
 
46
    PackData,
 
47
    write_pack_index_v2,
 
48
    )
 
49
from dulwich.objects import (
 
50
    ShaFile,
 
51
    sha_to_hex,
 
52
    hex_to_sha,
 
53
    )
36
54
 
37
55
class BzrBackend(Backend):
38
56
 
39
 
    def __init__(self, directory):
40
 
        self.directory = directory
 
57
    def __init__(self, transport):
 
58
        self.transport = transport
41
59
        self.mapping = default_mapping
42
60
 
43
61
    def get_refs(self):
44
62
        """ return a dict of all tags and branches in repository (and shas) """
45
63
        ret = {}
46
 
        repo_dir = BzrDir.open(self.directory)
47
 
        repo = repo_dir.open_repository()
48
 
        branch = None
49
 
        for branch in repo.find_branches(using=True):
50
 
            #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
51
 
            #FIXME: Need to get branch path relative to its repository and use this instead of nick
52
 
            ret["refs/heads/"+branch.nick] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())[0]
53
 
        if 'HEAD' not in ret and branch:
54
 
            ret['HEAD'] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())[0]
 
64
        repo_dir = BzrDir.open_from_transport(self.transport)
 
65
        repo = repo_dir.find_repository()
 
66
        repo.lock_read()
 
67
        try:
 
68
            store = get_object_store(repo)
 
69
            branch = None
 
70
            for branch in repo.find_branches(using=True):
 
71
                #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
 
72
                #FIXME: Need to get branch path relative to its repository and use this instead of nick
 
73
                ret["refs/heads/"+branch.nick] = store._lookup_revision_sha1(branch.last_revision())
 
74
            if 'HEAD' not in ret and branch:
 
75
                ret['HEAD'] = store._lookup_revision_sha1(branch.last_revision())
 
76
        finally:
 
77
            repo.unlock()
55
78
        return ret
56
79
 
57
80
    def apply_pack(self, refs, read):
64
87
 
65
88
        p = PackData(path)
66
89
        entries = p.sorted_entries()
 
90
        heads = []
 
91
        for e in entries:
 
92
            sha = e[0]
 
93
            offset = e[1]
 
94
            t, o = p.get_object_at (offset)
 
95
            if t == 1 or t == 4:
 
96
                heads.append(sha)
67
97
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
68
98
 
69
 
        def get_objects():
70
 
            pack = Pack(path[:-5])
71
 
            for obj in pack.iterobjects():
72
 
                yield obj
 
99
        repo_dir = BzrDir.open_from_transport(self.transport)
 
100
        target = repo_dir.find_repository()
73
101
 
74
 
        target = Repository.open(self.directory)
 
102
        objects = {}
 
103
        for tup in p.iterobjects():
 
104
            obj_type, obj = p.get_object_at (tup[0])
 
105
            if obj_type in range(1, 4):
 
106
                sf = ShaFile.from_raw_string (obj_type, obj)
 
107
                objects[hex_to_sha(sf.id)] = sf
75
108
 
76
109
        target.lock_write()
77
110
        try:
78
111
            target.start_write_group()
79
112
            try:
80
 
                import_git_objects(target, self.mapping, iter(get_objects()))
81
 
            finally:
 
113
                import_git_objects(target, self.mapping, objects,
 
114
                                   BazaarObjectStore (target, self.mapping),
 
115
                                   heads)
 
116
            except:
 
117
                target.abort_write_group()
 
118
                raise
 
119
            else:
82
120
                target.commit_write_group()
83
121
        finally:
84
122
            target.unlock()
86
124
        for oldsha, sha, ref in refs:
87
125
            if ref[:11] == 'refs/heads/':
88
126
                branch_nick = ref[11:]
 
127
                transport = self.transport.clone(branch_nick)
89
128
 
90
129
                try:
91
 
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
 
130
                    target_dir = BzrDir.open_from_transport(transport)
92
131
                except:
93
 
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
 
132
                    format = BzrDirFormat.get_default_format()
 
133
                    format.initialize_on_transport(transport)
94
134
 
95
135
                try:
96
136
                    target_branch = target_dir.open_branch()
102
142
 
103
143
    def fetch_objects(self, determine_wants, graph_walker, progress):
104
144
        """ yield git objects to send to client """
105
 
        repo = Repository.open(self.directory)
 
145
        bzrdir = BzrDir.open_from_transport(self.transport)
 
146
        repo = bzrdir.find_repository()
106
147
 
107
148
        # If this is a Git repository, just use the existing fetch_objects implementation.
108
 
        if getattr(repo, "fetch_objects", None) is None:
109
 
            return repo.fetch_objects(determine_wants, graph_walker, progress)
 
149
        if getattr(repo, "fetch_objects", None) is not None:
 
150
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
110
151
 
111
152
        wants = determine_wants(self.get_refs())
112
 
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
113
 
        rev_done = set()
114
 
        obj_sent = set()
115
 
 
116
 
        objects = set()
117
 
 
 
153
        graph_walker.reset()
118
154
        repo.lock_read()
119
 
        try:
120
 
            have = graph_walker.next()
121
 
            while have:
122
 
                rev_done.add(have)
123
 
                if repo.has_revision(self.mapping.revision_id_foreign_to_bzr(sha)):
124
 
                    graph_walker.ack(have)
125
 
                have = graph_walker.next()
126
 
 
127
 
            while commits_to_send:
128
 
                commit = commits_to_send.pop()
129
 
                if commit in rev_done:
130
 
                    continue
131
 
                rev_done.add(commit)
132
 
 
133
 
                rev = repo.get_revision(commit)
134
 
 
135
 
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
136
 
 
137
 
                for sha, obj, path in inventory_to_tree_and_blobs(repo, self.mapping, commit):
138
 
                    if sha not in obj_sent:
139
 
                        obj_sent.add(sha)
140
 
                        objects.add((obj, path))
141
 
 
142
 
                objects.add((revision_to_commit(rev, sha, self.mapping.revision_id_bzr_to_foreign), None))
143
 
 
144
 
        finally:
145
 
            repo.unlock()
146
 
 
147
 
        return (len(objects), iter(objects))
148
 
 
 
155
        store = BazaarObjectStore(repo)
 
156
        have = store.find_common_revisions(graph_walker)
 
157
        missing_sha1s = store.find_missing_objects(have, wants, progress)
 
158
        return store.iter_shas(missing_sha1s)
 
159
 
 
160
 
 
161
def serve_git(transport, host=None, port=None, inet=False):
 
162
    backend = BzrBackend(transport)
 
163
 
 
164
    server = TCPGitServer(backend, 'localhost')
 
165
    server.serve_forever()