/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

Fix branch cloning.

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