/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 tempfile
19
 
 
20
 
from bzrlib.repository import (
21
 
    Repository,
22
 
    )
23
 
 
24
 
from bzrlib.plugins.git.fetch import (
25
 
    import_git_objects,
26
 
    )
27
 
from bzrlib.plugins.git.mapping import (
28
 
    default_mapping,
29
 
    )
30
 
from bzrlib.plugins.git.object_store import (
31
 
    get_object_store
32
 
    )
33
 
 
34
 
from dulwich.server import (
35
 
    Backend,
36
 
    )
37
 
from dulwich.pack import (
38
 
    Pack,
39
 
    PackData,
40
 
    write_pack_index_v2,
41
 
    )
42
 
 
 
17
from dulwich.server import Backend
43
18
 
44
19
class BzrBackend(Backend):
45
20
 
46
21
    def __init__(self, directory):
47
22
        self.directory = directory
48
 
        self.mapping = default_mapping
49
23
 
50
24
    def get_refs(self):
51
25
        """ return a dict of all tags and branches in repository (and shas) """
52
 
        ret = {}
53
 
        repo_dir = BzrDir.open(self.directory)
54
 
        repo = repo_dir.open_repository()
55
 
        store = get_object_store(repo)
56
 
        branch = None
57
 
        for branch in repo.find_branches(using=True):
58
 
            #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
59
 
            #FIXME: Need to get branch path relative to its repository and use this instead of nick
60
 
            ret["refs/heads/"+branch.nick] = store._lookup_revision_sha1(branch.last_revision())
61
 
        if 'HEAD' not in ret and branch:
62
 
            ret['HEAD'] = store._lookup_revision_sha1(branch.last_revision())
63
 
        return ret
 
26
        return {}
64
27
 
65
28
    def apply_pack(self, refs, read):
66
29
        """ apply pack from client to current repository """
67
 
 
68
 
        fd, path = tempfile.mkstemp(suffix=".pack")
69
 
        f = os.fdopen(fd, 'w')
70
 
        f.write(read())
71
 
        f.close()
72
 
 
73
 
        p = PackData(path)
74
 
        entries = p.sorted_entries()
75
 
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
76
 
 
77
 
        def get_objects():
78
 
            pack = Pack(path[:-5])
79
 
            for obj in pack.iterobjects():
80
 
                yield obj
81
 
 
82
 
        target = Repository.open(self.directory)
83
 
 
84
 
        target.lock_write()
85
 
        try:
86
 
            target.start_write_group()
87
 
            try:
88
 
                import_git_objects(target, self.mapping, iter(get_objects()))
89
 
            finally:
90
 
                target.commit_write_group()
91
 
        finally:
92
 
            target.unlock()
93
 
 
94
 
        for oldsha, sha, ref in refs:
95
 
            if ref[:11] == 'refs/heads/':
96
 
                branch_nick = ref[11:]
97
 
 
98
 
                try:
99
 
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
100
 
                except:
101
 
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
102
 
 
103
 
                try:
104
 
                    target_branch = target_dir.open_branch()
105
 
                except:
106
 
                    target_branch = target_dir.create_branch()
107
 
 
108
 
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
109
 
                target_branch.generate_revision_history(rev_id)
 
30
        self.read()
110
31
 
111
32
    def fetch_objects(self, determine_wants, graph_walker, progress):
112
33
        """ yield git objects to send to client """
113
 
        repo = Repository.open(self.directory)
114
 
 
115
 
        # If this is a Git repository, just use the existing fetch_objects implementation.
116
 
        if getattr(repo, "fetch_objects", None) is not None:
117
 
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
118
 
 
119
 
        wants = determine_wants(self.get_refs())
120
 
 
121
 
        repo.lock_read()
122
 
        try:
123
 
            store = BazaarObjectStore(repo)
124
 
            have = store.find_missing_revisions(graph_walker)
125
 
            missing_sha1s = store.find_missing_objects(have, wants, progress)
126
 
            return self.object_store.iter_shas(missing_sha1s)
127
 
        finally:
128
 
            repo.unlock()
 
34