/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

  • Committer: Invité
  • Date: 2009-05-05 20:43:26 UTC
  • mto: (0.200.441 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: guest@mirexpress-20090505204326-n0vcprylu2hyzq4v
Ensure git plugin is loaded in bzr-*-pack

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
 
 
 
17
import os
31
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
 
 
44
from dulwich.server import (
 
45
    Backend,
 
46
    )
 
47
from dulwich.pack import (
 
48
    Pack,
 
49
    PackData,
 
50
    write_pack_index_v2,
 
51
    )
 
52
from dulwich.objects import (
 
53
    Blob,
 
54
    Commit,
 
55
    ShaFile,
 
56
    Tree,
 
57
    )
 
58
 
32
59
S_IFGITLINK = 0160000
33
60
 
34
61
#S_IFREG | 0664 # *Might* see this; would fail fsck --strict
134
161
 
135
162
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
136
163
 
137
 
                for sha, obj, path in inventory_to_tree_and_blobs(repo, self.mapping, commit):
 
164
                for sha, obj, path in inventory_to_tree_and_blobs(repo.get_inventory(commit), repo.texts, self.mapping):
138
165
                    if sha not in obj_sent:
139
166
                        obj_sent.add(sha)
140
167
                        objects.add((obj, path))