/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

Default to using global user id rather than making one up.

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
 
 
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
 
17
import os
 
18
import tempfile
 
19
 
 
20
from bzrlib.bzrdir import (
 
21
    BzrDir,
 
22
    )
 
23
from bzrlib.repository import (
 
24
    Repository,
 
25
    )
 
26
 
 
27
from bzrlib.plugins.git.fetch import (
 
28
    import_git_objects,
 
29
    BazaarObjectStore,
 
30
    )
 
31
from bzrlib.plugins.git.mapping import (
 
32
    default_mapping,
 
33
    )
 
34
from bzrlib.plugins.git.object_store import (
 
35
    get_object_store
 
36
    )
 
37
 
 
38
from dulwich.server import (
 
39
    Backend,
 
40
    )
 
41
from dulwich.pack import (
 
42
    Pack,
 
43
    PackData,
 
44
    write_pack_index_v2,
 
45
    )
35
46
 
36
47
 
37
48
class BzrBackend(Backend):
45
56
        ret = {}
46
57
        repo_dir = BzrDir.open(self.directory)
47
58
        repo = repo_dir.open_repository()
 
59
        store = get_object_store(repo)
48
60
        branch = None
49
61
        for branch in repo.find_branches(using=True):
50
62
            #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
51
63
            #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]
 
64
            ret["refs/heads/"+branch.nick] = store._lookup_revision_sha1(branch.last_revision())
53
65
        if 'HEAD' not in ret and branch:
54
 
            ret['HEAD'] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())[0]
 
66
            ret['HEAD'] = store._lookup_revision_sha1(branch.last_revision())
55
67
        return ret
56
68
 
57
69
    def apply_pack(self, refs, read):
105
117
        repo = Repository.open(self.directory)
106
118
 
107
119
        # 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, progress)
 
120
        if getattr(repo, "fetch_objects", None) is not None:
 
121
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
110
122
 
111
123
        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
124
 
118
125
        repo.lock_read()
119
126
        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
 
 
 
127
            store = BazaarObjectStore(repo)
 
128
            have = store.find_missing_revisions(graph_walker)
 
129
            missing_sha1s = store.find_missing_objects(have, wants, progress)
 
130
            return self.object_store.iter_shas(missing_sha1s)
144
131
        finally:
145
132
            repo.unlock()
146
 
 
147
 
        return (len(objects), iter(objects))
148