/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 git-import.

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