/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 tests.

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
 
17
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
 
18
36
 
19
37
class BzrBackend(Backend):
20
38
 
21
39
    def __init__(self, directory):
22
40
        self.directory = directory
 
41
        self.mapping = default_mapping
23
42
 
24
43
    def get_refs(self):
25
44
        """ return a dict of all tags and branches in repository (and shas) """
26
 
        return {}
 
45
        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]
 
55
        return ret
27
56
 
28
57
    def apply_pack(self, refs, read):
29
58
        """ apply pack from client to current repository """
30
 
        self.read()
 
59
 
 
60
        fd, path = tempfile.mkstemp(suffix=".pack")
 
61
        f = os.fdopen(fd, 'w')
 
62
        f.write(read())
 
63
        f.close()
 
64
 
 
65
        p = PackData(path)
 
66
        entries = p.sorted_entries()
 
67
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
 
68
 
 
69
        def get_objects():
 
70
            pack = Pack(path[:-5])
 
71
            for obj in pack.iterobjects():
 
72
                yield obj
 
73
 
 
74
        target = Repository.open(self.directory)
 
75
 
 
76
        target.lock_write()
 
77
        try:
 
78
            target.start_write_group()
 
79
            try:
 
80
                import_git_objects(target, self.mapping, iter(get_objects()))
 
81
            finally:
 
82
                target.commit_write_group()
 
83
        finally:
 
84
            target.unlock()
 
85
 
 
86
        for oldsha, sha, ref in refs:
 
87
            if ref[:11] == 'refs/heads/':
 
88
                branch_nick = ref[11:]
 
89
 
 
90
                try:
 
91
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
 
92
                except:
 
93
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
 
94
 
 
95
                try:
 
96
                    target_branch = target_dir.open_branch()
 
97
                except:
 
98
                    target_branch = target_dir.create_branch()
 
99
 
 
100
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
101
                target_branch.generate_revision_history(rev_id)
31
102
 
32
103
    def fetch_objects(self, determine_wants, graph_walker, progress):
33
104
        """ yield git objects to send to client """
 
105
        repo = Repository.open(self.directory)
 
106
 
 
107
        # 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, None, progress)
 
110
 
 
111
        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
 
 
118
        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))
34
148