/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

https://launchpad.net/bugs/539978
Cope with -0000 as timezone in Git commits.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.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
 
import bzrlib
18
17
from bzrlib import (
19
 
    branch,
 
18
    config,
 
19
    debug,
20
20
    tag,
 
21
    trace,
21
22
    ui,
22
23
    urlutils,
23
24
    )
28
29
    NoSuchRevision,
29
30
    NotLocalUrl,
30
31
    )
31
 
from bzrlib.trace import (
32
 
    info,
33
 
    )
34
32
from bzrlib.transport import (
35
33
    Transport,
36
34
    )
42
40
 
43
41
from bzrlib.plugins.git.branch import (
44
42
    GitBranch,
45
 
    extract_tags,
46
43
    )
47
44
from bzrlib.plugins.git.errors import (
48
45
    GitSmartRemoteNotSupported,
55
52
    mapping_registry,
56
53
    )
57
54
from bzrlib.plugins.git.repository import (
58
 
    GitRepositoryFormat,
59
55
    GitRepository,
60
56
    )
 
57
from bzrlib.plugins.git.refs import (
 
58
    extract_tags,
 
59
    branch_name_to_ref,
 
60
    )
61
61
 
62
62
import dulwich as git
63
63
from dulwich.errors import (
71
71
import tempfile
72
72
import urllib
73
73
import urlparse
74
 
 
75
 
try:
76
 
    from dulwich.pack import load_pack_index
77
 
except ImportError:
78
 
    from dulwich.pack import PackIndex as load_pack_index
79
 
 
80
 
 
81
 
# Don't run any tests on GitSmartTransport as it is not intended to be 
 
74
urlparse.uses_netloc.extend(['git', 'git+ssh'])
 
75
 
 
76
from dulwich.pack import load_pack_index
 
77
 
 
78
 
 
79
# Don't run any tests on GitSmartTransport as it is not intended to be
82
80
# a full implementation of Transport
83
81
def get_test_permutations():
84
82
    return []
85
83
 
86
84
 
 
85
def split_git_url(url):
 
86
    """Split a Git URL.
 
87
 
 
88
    :param url: Git URL
 
89
    :return: Tuple with host, port, username, path.
 
90
    """
 
91
    (scheme, netloc, loc, _, _) = urlparse.urlsplit(url)
 
92
    path = urllib.unquote(loc)
 
93
    if path.startswith("/~"):
 
94
        path = path[1:]
 
95
    (username, hostport) = urllib.splituser(netloc)
 
96
    (host, port) = urllib.splitnport(hostport, None)
 
97
    return (host, port, username, path)
 
98
 
 
99
 
87
100
class GitSmartTransport(Transport):
88
101
 
89
102
    def __init__(self, url, _client=None):
90
103
        Transport.__init__(self, url)
91
 
        (scheme, _, loc, _, _) = urlparse.urlsplit(url)
92
 
        hostport, self._path = urllib.splithost(loc)
93
 
        (self._username, hostport) = urllib.splituser(hostport)
94
 
        (self._host, self._port) = urllib.splitnport(hostport, None)
 
104
        (self._host, self._port, self._username, self._path) = \
 
105
            split_git_url(url)
 
106
        if 'transport' in debug.debug_flags:
 
107
            trace.mutter('host: %r, user: %r, port: %r, path: %r',
 
108
                         self._host, self._username, self._port, self._path)
95
109
        self._client = _client
96
110
 
97
111
    def external_url(self):
100
114
    def has(self, relpath):
101
115
        return False
102
116
 
103
 
    def _get_client(self):
 
117
    def _get_client(self, thin_packs):
104
118
        raise NotImplementedError(self._get_client)
105
119
 
106
120
    def _get_path(self):
109
123
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
110
124
        if progress is None:
111
125
            def progress(text):
112
 
                info("git: %s" % text)
113
 
        client = self._get_client()
 
126
                trace.info("git: %s" % text)
 
127
        client = self._get_client(thin_packs=False)
114
128
        try:
115
 
            return client.fetch_pack(self._get_path(), determine_wants, 
 
129
            return client.fetch_pack(self._get_path(), determine_wants,
116
130
                graph_walker, pack_data, progress)
117
131
        except GitProtocolError, e:
118
132
            raise BzrError(e)
119
133
 
120
134
    def send_pack(self, get_changed_refs, generate_pack_contents):
121
 
        client = self._get_client()
 
135
        client = self._get_client(thin_packs=False)
122
136
        try:
123
 
            return client.send_pack(self._get_path(), get_changed_refs, 
 
137
            return client.send_pack(self._get_path(), get_changed_refs,
124
138
                generate_pack_contents)
125
139
        except GitProtocolError, e:
126
140
            raise BzrError(e)
145
159
 
146
160
    _scheme = 'git'
147
161
 
148
 
    def _get_client(self):
 
162
    def _get_client(self, thin_packs):
149
163
        if self._client is not None:
150
164
            ret = self._client
151
165
            self._client = None
152
166
            return ret
153
 
        return git.client.TCPGitClient(self._host, self._port, thin_packs=False,
154
 
            report_activity=self._report_activity)
 
167
        return git.client.TCPGitClient(self._host, self._port,
 
168
            thin_packs=thin_packs, report_activity=self._report_activity)
155
169
 
156
170
 
157
171
class SSHGitSmartTransport(GitSmartTransport):
163
177
            return self._path[3:]
164
178
        return self._path
165
179
 
166
 
    def _get_client(self):
 
180
    def _get_client(self, thin_packs):
167
181
        if self._client is not None:
168
182
            ret = self._client
169
183
            self._client = None
170
184
            return ret
171
185
        return git.client.SSHGitClient(self._host, self._port, self._username,
172
 
            thin_packs=False, report_activity=self._report_activity)
 
186
            thin_packs=thin_packs, report_activity=self._report_activity)
173
187
 
174
188
 
175
189
class RemoteGitDir(GitDir):
181
195
        self._lockfiles = lockfiles
182
196
        self._mode_check_done = None
183
197
 
 
198
    def _branch_name_to_ref(self, name):
 
199
        return branch_name_to_ref(name, default="refs/heads/master")
 
200
 
184
201
    def open_repository(self):
185
202
        return RemoteGitRepository(self, self._lockfiles)
186
203
 
187
 
    def open_branch(self, ignore_fallbacks=False):
 
204
    def _open_branch(self, name=None, ignore_fallbacks=False, 
 
205
                    unsupported=False):
188
206
        repo = self.open_repository()
189
 
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
190
 
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
 
207
        refname = self._branch_name_to_ref(name)
 
208
        return RemoteGitBranch(self, repo, refname, self._lockfiles)
191
209
 
192
 
    def open_workingtree(self):
 
210
    def open_workingtree(self, recommend_upgrade=False):
193
211
        raise NotLocalUrl(self.transport.base)
194
212
 
195
213
 
206
224
        self.resolve_ext_ref = resolve_ext_ref
207
225
 
208
226
    @property
 
227
    def data(self):
 
228
        if self._data is None:
 
229
            self._data = PackData(self._data_path)
 
230
        return self._data
 
231
 
 
232
    @property
209
233
    def index(self):
210
234
        if self._idx is None:
211
 
            pb = ui.ui_factory.nested_progress_bar()
212
 
            try:
213
 
                def report_progress(cur, total):
214
 
                    pb.update("generating index", cur, total)
215
 
                self.data.create_index(self._idx_path, self.resolve_ext_ref,
216
 
                    progress=report_progress)
217
 
            finally:
218
 
                pb.finished()
 
235
            if not os.path.exists(self._idx_path):
 
236
                pb = ui.ui_factory.nested_progress_bar()
 
237
                try:
 
238
                    def report_progress(cur, total):
 
239
                        pb.update("generating index", cur, total)
 
240
                    self.data.create_index(self._idx_path, self.resolve_ext_ref,
 
241
                        progress=report_progress)
 
242
                finally:
 
243
                    pb.finished()
219
244
            self._idx = load_pack_index(self._idx_path)
220
245
        return self._idx
221
246
 
222
247
    def __del__(self):
223
 
        os.remove(self._data_path)
224
 
        os.remove(self._idx_path)
 
248
        if self._idx is not None:
 
249
            self._idx.close()
 
250
            os.remove(self._idx_path)
 
251
        if self._data is not None:
 
252
            self._data.close()
 
253
            os.remove(self._data_path)
225
254
 
226
255
 
227
256
class RemoteGitRepository(GitRepository):
245
274
    def get_refs(self):
246
275
        if self._refs is not None:
247
276
            return self._refs
248
 
        self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None, 
249
 
            lambda x: None, lambda x: mutter("git: %s" % x))
 
277
        self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None,
 
278
            lambda x: None, lambda x: trace.mutter("git: %s" % x))
250
279
        return self._refs
251
280
 
252
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
 
281
    def fetch_pack(self, determine_wants, graph_walker, pack_data,
253
282
                   progress=None):
254
283
        return self._transport.fetch_pack(determine_wants, graph_walker,
255
284
                                          pack_data, progress)
257
286
    def send_pack(self, get_changed_refs, generate_pack_contents):
258
287
        return self._transport.send_pack(get_changed_refs, generate_pack_contents)
259
288
 
260
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
289
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
290
                      progress=None):
261
291
        fd, path = tempfile.mkstemp(suffix=".pack")
262
 
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
292
        self.fetch_pack(determine_wants, graph_walker,
 
293
            lambda x: os.write(fd, x), progress)
263
294
        os.close(fd)
264
295
        if os.path.getsize(path) == 0:
265
296
            return EmptyObjectStoreIterator()
266
297
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
267
298
 
268
 
    def lookup_git_revid(self, bzr_revid):
 
299
    def lookup_bzr_revision_id(self, bzr_revid):
269
300
        # This won't work for any round-tripped bzr revisions, but it's a start..
270
301
        try:
271
302
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
280
311
        self.repository = branch.repository
281
312
 
282
313
    def get_tag_dict(self):
283
 
        return extract_tags(self.repository.get_refs(), self.branch.mapping)
 
314
        tags = {}
 
315
        for k, v in extract_tags(self.repository.get_refs()).iteritems():
 
316
            tags[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
317
        return tags
284
318
 
285
319
    def set_tag(self, name, revid):
286
320
        # FIXME: Not supported yet, should do a push of a new ref
291
325
 
292
326
    def __init__(self, bzrdir, repository, name, lockfiles):
293
327
        self._ref = None
294
 
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, 
 
328
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
295
329
                lockfiles)
296
330
 
297
331
    def revision_history(self):
300
334
    def last_revision(self):
301
335
        return self.mapping.revision_id_foreign_to_bzr(self.head)
302
336
 
 
337
    def _get_config(self):
 
338
        class EmptyConfig(object):
 
339
 
 
340
            def _get_configobj(self):
 
341
                return config.ConfigObj()
 
342
 
 
343
        return EmptyConfig()
 
344
 
303
345
    @property
304
346
    def head(self):
305
347
        if self._ref is not None:
306
348
            return self._ref
307
349
        heads = self.repository.get_refs()
308
 
        if not self.name in heads:
309
 
            raise NoSuchRef(name)
310
 
        self._ref = heads[self.name]
 
350
        if self.name in heads:
 
351
            self._ref = heads[self.name]
 
352
        elif ("refs/heads/" + self.name) in heads:
 
353
            self._ref = heads["refs/heads/" + self.name]
 
354
        else:
 
355
            raise NoSuchRef(self.name)
311
356
        return self._ref
312
357
 
313
358
    def _synchronize_history(self, destination, revision_id):
314
359
        """See Branch._synchronize_history()."""
315
360
        destination.generate_revision_history(self.last_revision())
316
 
 
 
361
 
317
362
    def get_push_location(self):
318
363
        return None
319
364