/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

Merge new bzr-foreign.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
16
16
 
17
17
from bzrlib.bzrdir import BzrDir
18
18
from bzrlib.repository import Repository
19
 
from bzrlib.inventory import InventoryDirectory, InventoryFile
20
 
from bzrlib.osutils import splitpath
21
19
 
22
20
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
 
21
from bzrlib.plugins.git.mapping import default_mapping
24
22
 
25
23
from dulwich.server import Backend
26
24
from dulwich.pack import Pack, PackData, write_pack_index_v2
27
 
from dulwich.objects import ShaFile, Commit, Tree, Blob
 
25
from dulwich.objects import ShaFile
28
26
 
29
27
import os, tempfile
30
28
 
31
 
import stat
32
 
S_IFGITLINK = 0160000
33
 
 
34
 
#S_IFREG | 0664 # *Might* see this; would fail fsck --strict
35
 
 
36
 
 
37
29
class BzrBackend(Backend):
38
30
 
39
31
    def __init__(self, directory):
42
34
 
43
35
    def get_refs(self):
44
36
        """ return a dict of all tags and branches in repository (and shas) """
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
 
37
        return {}
56
38
 
57
39
    def apply_pack(self, refs, read):
58
40
        """ apply pack from client to current repository """
96
78
                    target_branch = target_dir.open_branch()
97
79
                except:
98
80
                    target_branch = target_dir.create_branch()
99
 
 
 
81
               
100
82
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
101
 
                target_branch.generate_revision_history(rev_id)
 
83
                target_branch.generate_revision_history(rev_id) 
102
84
 
103
85
    def fetch_objects(self, determine_wants, graph_walker, progress):
104
86
        """ 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))
148
87