/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 remote.py

Reoncile InterGitRepository objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
23
23
from bzrlib.trace import info
24
24
from bzrlib.transport import Transport
25
25
 
26
 
from bzrlib.plugins.git import lazy_check_versions
27
 
lazy_check_versions()
28
 
 
 
26
from bzrlib.plugins.git import git
29
27
from bzrlib.plugins.git.branch import GitBranch
30
 
from bzrlib.plugins.git.errors import NoSuchRef
31
 
from bzrlib.plugins.git.dir import GitDir
32
28
from bzrlib.plugins.git.foreign import ForeignBranch
33
29
from bzrlib.plugins.git.repository import GitFormat, GitRepository
34
30
 
35
 
import os
36
 
import tempfile
37
31
import urllib
38
32
import urlparse
39
33
 
40
 
import dulwich as git
41
 
from dulwich.pack import PackData, Pack
42
 
 
43
 
# Don't run any tests on GitSmartTransport as it is not intended to be 
44
 
# a full implementation of Transport
45
 
def get_test_permutations():
46
 
    return []
 
34
from dulwich.pack import PackData
47
35
 
48
36
 
49
37
class GitSmartTransport(Transport):
54
42
        assert scheme == "git"
55
43
        hostport, self._path = urllib.splithost(loc)
56
44
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
57
 
        self._client = _client
58
 
 
59
 
    def _get_client(self):
60
 
        if self._client is not None:
61
 
            ret = self._client
62
 
            self._client = None
63
 
            return ret
64
 
        return git.client.TCPGitClient(self._host, self._port)
 
45
        if _client is not None:
 
46
            self._client = _client
 
47
        else:
 
48
            self._client = git.client.TCPGitClient(self._host, self._port)
65
49
 
66
50
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
67
51
        if progress is None:
68
52
            def progress(text):
69
53
                info("git: %s" % text)
70
 
        self._get_client().fetch_pack(self._path, determine_wants, 
71
 
            graph_walker, pack_data, progress)
 
54
        self._client.fetch_pack(self._path, determine_wants, graph_walker, 
 
55
                pack_data, progress)
 
56
 
 
57
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
58
        fd, path = tempfile.mkstemp(dir=self.pack_dir(), suffix=".pack")
 
59
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
60
        os.close(fd)
 
61
        try:
 
62
            p = PackData(path)
 
63
            for o in p.iterobjects():
 
64
                yield o
 
65
        finally:
 
66
            os.remove(path)
72
67
 
73
68
    def get(self, path):
74
69
        raise NoSuchFile(path)
75
70
 
76
 
    def abspath(self, relpath):
77
 
        return urlutils.join(self.base, relpath)
78
 
 
79
71
    def clone(self, offset=None):
80
72
        """See Transport.clone()."""
81
73
        if offset is None:
86
78
        return GitSmartTransport(newurl, self._client)
87
79
 
88
80
 
89
 
class RemoteGitDir(GitDir):
 
81
class RemoteGitDir(BzrDir):
90
82
 
91
83
    def __init__(self, transport, lockfiles, format):
92
84
        self._format = format
94
86
        self.transport = transport
95
87
        self._lockfiles = lockfiles
96
88
 
 
89
    def is_supported(self):
 
90
        return True
 
91
 
97
92
    def open_repository(self):
98
93
        return RemoteGitRepository(self, self._lockfiles)
99
94
 
100
 
    def open_branch(self, _unsupported=False):
 
95
    def open_branch(self):
101
96
        repo = self.open_repository()
102
97
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
103
98
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
105
100
    def open_workingtree(self):
106
101
        raise NotLocalUrl(self.transport.base)
107
102
 
108
 
 
109
 
class TemporaryPackIterator(object):
110
 
 
111
 
    def __init__(self, path):
112
 
        self.path_data = path
113
 
        basename = path[:-len(".pack")]
114
 
        p = PackData(path)
115
 
        self.path_idx = basename+".idx"
116
 
        p.create_index_v2(self.path_idx)
117
 
        self.pack = Pack(basename)
118
 
        self._iter = self.pack.iterobjects()
119
 
 
120
 
    def __del__(self):
121
 
        os.remove(self.path_data)
122
 
        os.remove(self.path_idx)
123
 
 
124
 
    def next(self):
125
 
        return (self._iter.next(), None)
126
 
 
127
 
    def __len__(self):
128
 
        return len(self.pack)
 
103
    def cloning_metadir(self, stacked=False):
 
104
        """Produce a metadir suitable for cloning with."""
 
105
        if stacked:
 
106
            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6.1-rich-root")
 
107
        else:
 
108
            return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
129
109
 
130
110
 
131
111
class RemoteGitRepository(GitRepository):
133
113
    def __init__(self, gitdir, lockfiles):
134
114
        GitRepository.__init__(self, gitdir, lockfiles)
135
115
 
136
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
137
 
                   progress=None):
138
 
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
139
 
            progress)
140
 
 
141
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
142
 
        fd, path = tempfile.mkstemp(suffix=".pack")
143
 
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
144
 
        os.close(fd)
145
 
        ret = TemporaryPackIterator(path)
146
 
        return (len(ret), iter(ret.next, None))
 
116
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
 
117
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, progress)
147
118
 
148
119
 
149
120
class RemoteGitBranch(GitBranch):
150
121
 
151
122
    def __init__(self, bzrdir, repository, name, lockfiles):
152
123
        def determine_wants(heads):
153
 
            if not name in heads:
154
 
                raise NoSuchRef(name)
155
124
            self._ref = heads[name]
156
125
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
157
126
                             lambda x: mutter("git: %s" % x))
160
129
    def last_revision(self):
161
130
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
162
131
 
163
 
    def _synchronize_history(self, destination, revision_id):
164
 
        """See Branch._synchronize_history()."""
165
 
        destination.generate_revision_history(self.last_revision())
166
 
 
 
132
 
 
133