/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.358.2 by Jelmer Vernooij
Refresh copyright headers, add my email.
1
# Copyright (C) 2007-2018 Jelmer Vernooij <jelmer@jelmer.uk>
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
0.358.1 by Jelmer Vernooij
Fix FSF address.
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
16
0.358.3 by Jelmer Vernooij
Enable absolute import.
17
"""Remote dirs, repositories and branches."""
18
0.200.1594 by Jelmer Vernooij
Use absolute_import everywhere.
19
from __future__ import absolute_import
20
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
21
import gzip
0.405.1 by Jelmer Vernooij
Use same logic for interpreting progress reports everywhere.
22
import re
23
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
24
from .. import (
0.200.596 by Jelmer Vernooij
Import RemoteGitBranch._get_config().
25
    config,
0.200.707 by Jelmer Vernooij
Add debug routines.
26
    debug,
0.404.5 by Jelmer Vernooij
Check for diverged branches during push.
27
    errors,
6968.4.4 by Jelmer Vernooij
Update for API changes from archive branch.
28
    osutils,
0.200.586 by Jelmer Vernooij
Fix issues pointed out by pyflakes.
29
    trace,
0.200.333 by Jelmer Vernooij
Support progress reporting when creating index.
30
    ui,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
31
    urlutils,
32
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
33
from ..push import (
0.401.4 by Jelmer Vernooij
Implement RemoteGitDir.push_branch.
34
    PushResult,
35
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
36
from ..errors import (
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
37
    AlreadyBranchError,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
38
    BzrError,
0.404.5 by Jelmer Vernooij
Check for diverged branches during push.
39
    DivergedBranches,
0.200.1412 by Jelmer Vernooij
Implement GitControlDirFormat.supports_transport.
40
    InProcessTransport,
0.200.415 by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories.
41
    InvalidRevisionId,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
42
    NoSuchFile,
0.200.415 by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories.
43
    NoSuchRevision,
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
44
    NoSuchTag,
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
45
    NotBranchError,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
46
    NotLocalUrl,
7103.1.2 by Jelmer Vernooij
Handle PermissionDenied.
47
    PermissionDenied,
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
48
    UninitializableFormat,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
49
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
50
from ..revisiontree import RevisionTree
7289.1.2 by Jelmer Vernooij
Fix pushing of tags as part of nascent git branches.
51
from ..sixish import (
52
    text_type,
53
    viewitems,
54
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
55
from ..transport import (
0.200.292 by Jelmer Vernooij
Fix formatting.
56
    Transport,
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
57
    register_urlparse_netloc_protocol,
0.200.292 by Jelmer Vernooij
Fix formatting.
58
    )
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
59
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
60
from . import (
0.200.292 by Jelmer Vernooij
Fix formatting.
61
    lazy_check_versions,
7359.1.1 by Jelmer Vernooij
Only set user agent for GitHub.
62
    is_github_url,
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
63
    user_agent_for_github,
0.200.292 by Jelmer Vernooij
Fix formatting.
64
    )
0.200.200 by Jelmer Vernooij
Register lazily where possible.
65
lazy_check_versions()
66
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
67
from .branch import (
0.200.292 by Jelmer Vernooij
Fix formatting.
68
    GitBranch,
0.295.1 by Jelmer Vernooij
Split up branch formats.
69
    GitBranchFormat,
0.403.3 by Jelmer Vernooij
Test RemoteGitDir.push_branch.
70
    GitBranchPushResult,
0.200.1064 by Jelmer Vernooij
Use common base class for tags.
71
    GitTags,
0.406.2 by Jelmer Vernooij
Add tests.
72
    _quick_lookup_revno,
0.200.292 by Jelmer Vernooij
Fix formatting.
73
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
74
from .dir import (
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
75
    GitControlDirFormat,
76
    GitDir,
77
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
78
from .errors import (
0.200.319 by Jelmer Vernooij
Print proper error when trying unsupported operations against a git server.
79
    GitSmartRemoteNotSupported,
0.200.292 by Jelmer Vernooij
Fix formatting.
80
    NoSuchRef,
81
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
82
from .mapping import (
0.200.415 by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories.
83
    mapping_registry,
84
    )
0.401.4 by Jelmer Vernooij
Implement RemoteGitDir.push_branch.
85
from .object_store import (
86
    get_object_store,
87
    )
0.404.5 by Jelmer Vernooij
Check for diverged branches during push.
88
from .push import (
89
    remote_divergence,
90
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
91
from .repository import (
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
92
    GitRepository,
7290.20.3 by Jelmer Vernooij
Fix tests for git/full history branches.
93
    GitRepositoryFormat,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
94
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
95
from .refs import (
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
96
    branch_name_to_ref,
0.200.1487 by Jelmer Vernooij
Use peeling.
97
    is_peeled,
0.375.1 by Jelmer Vernooij
Fix remote tests, warn when fetching git->bzr and bzr->git.
98
    ref_to_tag_name,
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
99
    tag_name_to_ref,
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
100
    )
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
101
0.200.1336 by Jelmer Vernooij
Support the git smart server http protocol.
102
import dulwich
103
import dulwich.client
0.200.292 by Jelmer Vernooij
Fix formatting.
104
from dulwich.errors import (
105
    GitProtocolError,
7143.2.1 by Jelmer Vernooij
Don't hardcode the list of supported archive formats.
106
    HangupException,
0.200.292 by Jelmer Vernooij
Fix formatting.
107
    )
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
108
from dulwich.pack import (
109
    Pack,
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
110
    pack_objects_to_data,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
111
    )
0.403.3 by Jelmer Vernooij
Test RemoteGitDir.push_branch.
112
from dulwich.protocol import ZERO_SHA
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
113
from dulwich.refs import (
114
    DictRefsContainer,
115
    SYMREF,
116
    )
117
from dulwich.repo import (
118
    NotGitRepository,
119
    )
0.200.167 by Jelmer Vernooij
Implement fetch_objects properly.
120
import os
0.200.1624 by Jelmer Vernooij
Add ssh vendor for dulwich that uses the bzr ssh vendor.
121
import select
0.200.167 by Jelmer Vernooij
Implement fetch_objects properly.
122
import tempfile
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
123
124
try:
125
    import urllib.parse as urlparse
126
    from urllib.parse import splituser, splitnport
127
except ImportError:
128
    import urlparse
129
    from urllib import splituser, splitnport
0.200.1555 by Jelmer Vernooij
Remove segment parameters for http smart transports.
130
131
# urlparse only supports a limited number of schemes by default
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
132
register_urlparse_netloc_protocol('git')
133
register_urlparse_netloc_protocol('git+ssh')
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
134
0.200.586 by Jelmer Vernooij
Fix issues pointed out by pyflakes.
135
from dulwich.pack import load_pack_index
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
136
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
137
0.406.1 by Jelmer Vernooij
Properly lookup revnos for brz-git push result.
138
class GitPushResult(PushResult):
139
140
    def _lookup_revno(self, revid):
0.406.2 by Jelmer Vernooij
Add tests.
141
        try:
142
            return _quick_lookup_revno(self.source_branch, self.target_branch,
7143.15.2 by Jelmer Vernooij
Run autopep8.
143
                                       revid)
0.406.2 by Jelmer Vernooij
Add tests.
144
        except GitSmartRemoteNotSupported:
145
            return None
0.406.1 by Jelmer Vernooij
Properly lookup revnos for brz-git push result.
146
147
    @property
148
    def old_revno(self):
149
        return self._lookup_revno(self.old_revid)
150
151
    @property
152
    def new_revno(self):
153
        return self._lookup_revno(self.new_revid)
154
155
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
156
# Don't run any tests on GitSmartTransport as it is not intended to be
0.200.181 by Jelmer Vernooij
Support setting tags.
157
# a full implementation of Transport
158
def get_test_permutations():
159
    return []
160
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
161
0.200.708 by Jelmer Vernooij
Factor out URL parsing.
162
def split_git_url(url):
0.200.709 by Jelmer Vernooij
When unpacking URLs, strip leftmost slash to match gits behaviour.
163
    """Split a Git URL.
164
165
    :param url: Git URL
166
    :return: Tuple with host, port, username, path.
167
    """
0.200.743 by Jelmer Vernooij
Fix URL parsing.
168
    (scheme, netloc, loc, _, _) = urlparse.urlsplit(url)
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
169
    path = urlparse.unquote(loc)
0.246.2 by Jelmer Vernooij
Improve the fix dealing with git repo's in home directories.
170
    if path.startswith("/~"):
0.200.709 by Jelmer Vernooij
When unpacking URLs, strip leftmost slash to match gits behaviour.
171
        path = path[1:]
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
172
    (username, hostport) = splituser(netloc)
173
    (host, port) = splitnport(hostport, None)
0.200.708 by Jelmer Vernooij
Factor out URL parsing.
174
    return (host, port, username, path)
175
176
0.200.1562 by Jelmer Vernooij
Add separate exception for remote errors.
177
class RemoteGitError(BzrError):
178
0.290.1 by Jelmer Vernooij
Avoid 'message' argument in RemoteGitError; apparently it breaks some versions of Python.
179
    _fmt = "Remote server error: %(msg)s"
0.200.1562 by Jelmer Vernooij
Add separate exception for remote errors.
180
181
7103.1.1 by Jelmer Vernooij
Improved error parsing for Git branches.
182
class HeadUpdateFailed(BzrError):
183
184
    _fmt = ("Unable to update remote HEAD branch. To update the master "
185
            "branch, specify the URL %(base_url)s,branch=master.")
186
187
    def __init__(self, base_url):
188
        super(HeadUpdateFailed, self).__init__()
189
        self.base_url = base_url
190
191
0.200.1275 by Jelmer Vernooij
recognize missing repositories
192
def parse_git_error(url, message):
193
    """Parse a remote git server error and return a bzr exception.
194
195
    :param url: URL of the remote repository
196
    :param message: Message sent by the remote git server
197
    """
198
    message = str(message).strip()
7143.15.2 by Jelmer Vernooij
Run autopep8.
199
    if (message.startswith("Could not find Repository ")
200
        or message == 'Repository not found.'
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
201
            or (message.startswith('Repository ') and
202
                message.endswith(' not found.'))):
0.200.1275 by Jelmer Vernooij
recognize missing repositories
203
        return NotBranchError(url, message)
0.200.1563 by Jelmer Vernooij
Improve error message.
204
    if message == "HEAD failed to update":
205
        base_url, _ = urlutils.split_segment_parameters(url)
7103.1.1 by Jelmer Vernooij
Improved error parsing for Git branches.
206
        return HeadUpdateFailed(base_url)
7103.1.2 by Jelmer Vernooij
Handle PermissionDenied.
207
    if message.startswith('access denied or repository not exported:'):
7103.1.3 by Jelmer Vernooij
Strip space.
208
        extra, path = message.split(': ', 1)
7103.1.2 by Jelmer Vernooij
Handle PermissionDenied.
209
        return PermissionDenied(path, extra)
7131.7.4 by Jelmer Vernooij
Don't use GitLab string.
210
    if message.endswith('You are not allowed to push code to this project.'):
7131.7.2 by Jelmer Vernooij
Handle github PermissionDenied.
211
        return PermissionDenied(url, message)
7131.7.3 by Jelmer Vernooij
Handle one more error.
212
    if message.endswith(' does not appear to be a git repository'):
213
        return NotBranchError(url, message)
7379.1.1 by Jelmer Vernooij
Handle invalid repository name on GitHub.
214
    if re.match('(.+) is not a valid repository name',
215
                message.splitlines()[0]):
216
        return NotBranchError(url, message)
7131.7.2 by Jelmer Vernooij
Handle github PermissionDenied.
217
    m = re.match(r'Permission to ([^ ]+) denied to ([^ ]+)\.', message)
218
    if m:
219
        return PermissionDenied(m.group(1), 'denied to %s' % m.group(2))
0.200.1275 by Jelmer Vernooij
recognize missing repositories
220
    # Don't know, just return it to the user as-is
0.200.1562 by Jelmer Vernooij
Add separate exception for remote errors.
221
    return RemoteGitError(message)
0.200.1275 by Jelmer Vernooij
recognize missing repositories
222
223
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
224
class GitSmartTransport(Transport):
225
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
226
    def __init__(self, url, _client=None):
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
227
        Transport.__init__(self, url)
0.200.708 by Jelmer Vernooij
Factor out URL parsing.
228
        (self._host, self._port, self._username, self._path) = \
229
            split_git_url(url)
0.200.707 by Jelmer Vernooij
Add debug routines.
230
        if 'transport' in debug.debug_flags:
231
            trace.mutter('host: %r, user: %r, port: %r, path: %r',
232
                         self._host, self._username, self._port, self._path)
0.200.166 by Jelmer Vernooij
don't reuse client objects.
233
        self._client = _client
0.200.1464 by Jelmer Vernooij
Warn about ignoring path segment parameters when using bzr 2.4.
234
        self._stripped_path = self._path.rsplit(",", 1)[0]
0.200.166 by Jelmer Vernooij
don't reuse client objects.
235
0.200.543 by Jelmer Vernooij
Implement GitSmartTransport.external_url().
236
    def external_url(self):
237
        return self.base
238
0.200.238 by Jelmer Vernooij
Import Transport.has().
239
    def has(self, relpath):
240
        return False
241
0.344.1 by Jelmer Vernooij
Allow using local git executable by accessing git:///some/path.
242
    def _get_client(self):
0.200.307 by Jelmer Vernooij
Support git+ssh.
243
        raise NotImplementedError(self._get_client)
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
244
0.200.470 by Jelmer Vernooij
Properly parse username in URLs.
245
    def _get_path(self):
0.200.1464 by Jelmer Vernooij
Warn about ignoring path segment parameters when using bzr 2.4.
246
        return self._stripped_path
0.200.470 by Jelmer Vernooij
Properly parse username in URLs.
247
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
248
    def get(self, path):
249
        raise NoSuchFile(path)
250
0.200.160 by Jelmer Vernooij
Implement abspath.
251
    def abspath(self, relpath):
252
        return urlutils.join(self.base, relpath)
253
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
254
    def clone(self, offset=None):
255
        """See Transport.clone()."""
256
        if offset is None:
257
            newurl = self.base
258
        else:
259
            newurl = urlutils.join(self.base, offset)
260
0.200.307 by Jelmer Vernooij
Support git+ssh.
261
        return self.__class__(newurl, self._client)
262
263
264
class TCPGitSmartTransport(GitSmartTransport):
265
0.200.332 by Jelmer Vernooij
Support activity reporting.
266
    _scheme = 'git'
267
0.344.1 by Jelmer Vernooij
Allow using local git executable by accessing git:///some/path.
268
    def _get_client(self):
0.200.307 by Jelmer Vernooij
Support git+ssh.
269
        if self._client is not None:
270
            ret = self._client
271
            self._client = None
272
            return ret
0.344.1 by Jelmer Vernooij
Allow using local git executable by accessing git:///some/path.
273
        if self._host == '':
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
274
            # return dulwich.client.LocalGitClient()
275
            return dulwich.client.SubprocessGitClient()
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
276
        return dulwich.client.TCPGitClient(
277
            self._host, self._port, report_activity=self._report_activity)
0.200.307 by Jelmer Vernooij
Support git+ssh.
278
279
0.200.1624 by Jelmer Vernooij
Add ssh vendor for dulwich that uses the bzr ssh vendor.
280
class SSHSocketWrapper(object):
281
282
    def __init__(self, sock):
283
        self.sock = sock
284
285
    def read(self, len=None):
286
        return self.sock.recv(len)
287
288
    def write(self, data):
289
        return self.sock.write(data)
290
291
    def can_read(self):
292
        return len(select.select([self.sock.fileno()], [], [], 0)[0]) > 0
293
294
295
class DulwichSSHVendor(dulwich.client.SSHVendor):
296
297
    def __init__(self):
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
298
        from ..transport import ssh
0.200.1624 by Jelmer Vernooij
Add ssh vendor for dulwich that uses the bzr ssh vendor.
299
        self.bzr_ssh_vendor = ssh._get_ssh_vendor()
300
301
    def run_command(self, host, command, username=None, port=None):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
302
        connection = self.bzr_ssh_vendor.connect_ssh(
303
            username=username, password=None, port=port, host=host,
304
            command=command)
0.200.1624 by Jelmer Vernooij
Add ssh vendor for dulwich that uses the bzr ssh vendor.
305
        (kind, io_object) = connection.get_sock_or_pipes()
306
        if kind == 'socket':
307
            return SSHSocketWrapper(io_object)
308
        else:
309
            raise AssertionError("Unknown io object kind %r'" % kind)
310
311
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
312
# dulwich.client.get_ssh_vendor = DulwichSSHVendor
0.200.1624 by Jelmer Vernooij
Add ssh vendor for dulwich that uses the bzr ssh vendor.
313
314
0.200.307 by Jelmer Vernooij
Support git+ssh.
315
class SSHGitSmartTransport(GitSmartTransport):
316
0.200.332 by Jelmer Vernooij
Support activity reporting.
317
    _scheme = 'git+ssh'
318
0.200.470 by Jelmer Vernooij
Properly parse username in URLs.
319
    def _get_path(self):
0.200.1464 by Jelmer Vernooij
Warn about ignoring path segment parameters when using bzr 2.4.
320
        path = self._stripped_path
0.200.1318 by Jelmer Vernooij
Strip segment parameters where necessary.
321
        if path.startswith("/~/"):
322
            return path[3:]
323
        return path
0.200.470 by Jelmer Vernooij
Properly parse username in URLs.
324
0.344.1 by Jelmer Vernooij
Allow using local git executable by accessing git:///some/path.
325
    def _get_client(self):
0.200.307 by Jelmer Vernooij
Support git+ssh.
326
        if self._client is not None:
327
            ret = self._client
328
            self._client = None
329
            return ret
0.253.1 by Ross Light
Added configuration options for git-upload-pack and git-receive-pack
330
        location_config = config.LocationConfig(self.base)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
331
        client = dulwich.client.SSHGitClient(
332
            self._host, self._port, self._username,
333
            report_activity=self._report_activity)
0.253.1 by Ross Light
Added configuration options for git-upload-pack and git-receive-pack
334
        # Set up alternate pack program paths
335
        upload_pack = location_config.get_user_option('git_upload_pack')
336
        if upload_pack:
0.200.949 by Jelmer Vernooij
merge support for specifying alternative paths for git executables.
337
            client.alternative_paths["upload-pack"] = upload_pack
0.253.1 by Ross Light
Added configuration options for git-upload-pack and git-receive-pack
338
        receive_pack = location_config.get_user_option('git_receive_pack')
339
        if receive_pack:
0.200.949 by Jelmer Vernooij
merge support for specifying alternative paths for git executables.
340
            client.alternative_paths["receive-pack"] = receive_pack
0.253.1 by Ross Light
Added configuration options for git-upload-pack and git-receive-pack
341
        return client
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
342
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
343
0.295.1 by Jelmer Vernooij
Split up branch formats.
344
class RemoteGitBranchFormat(GitBranchFormat):
345
346
    def get_format_description(self):
347
        return 'Remote Git Branch'
348
349
    @property
350
    def _matchingcontroldir(self):
351
        return RemoteGitControlDirFormat()
352
0.295.2 by Jelmer Vernooij
Make RemoteGitBranchFormat uninitializeable.
353
    def initialize(self, a_controldir, name=None, repository=None,
354
                   append_revisions_only=None):
355
        raise UninitializableFormat(self)
356
0.295.1 by Jelmer Vernooij
Split up branch formats.
357
0.407.1 by Jelmer Vernooij
Improve progress reporting.
358
class DefaultProgressReporter(object):
359
360
    _GIT_PROGRESS_PARTIAL_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
361
    _GIT_PROGRESS_TOTAL_RE = re.compile(r"(.*?): (\d+)")
362
363
    def __init__(self, pb):
364
        self.pb = pb
365
366
    def progress(self, text):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
367
        text = text.rstrip(b"\r\n")
368
        text = text.decode('utf-8')
7131.7.1 by Jelmer Vernooij
Handle permission denied by GitLab.
369
        if text.lower().startswith('error: '):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
370
            trace.show_error('git: %s', text[len(b'error: '):])
0.405.1 by Jelmer Vernooij
Use same logic for interpreting progress reports everywhere.
371
        else:
0.407.1 by Jelmer Vernooij
Improve progress reporting.
372
            trace.mutter("git: %s", text)
373
            g = self._GIT_PROGRESS_PARTIAL_RE.match(text)
0.405.1 by Jelmer Vernooij
Use same logic for interpreting progress reports everywhere.
374
            if g is not None:
0.407.1 by Jelmer Vernooij
Improve progress reporting.
375
                (text, pct, current, total) = g.groups()
376
                self.pb.update(text, int(current), int(total))
0.405.1 by Jelmer Vernooij
Use same logic for interpreting progress reports everywhere.
377
            else:
0.407.1 by Jelmer Vernooij
Improve progress reporting.
378
                g = self._GIT_PROGRESS_TOTAL_RE.match(text)
379
                if g is not None:
380
                    (text, total) = g.groups()
381
                    self.pb.update(text, None, int(total))
382
                else:
383
                    trace.note("%s", text)
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
384
385
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
386
class RemoteGitDir(GitDir):
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
387
0.344.1 by Jelmer Vernooij
Allow using local git executable by accessing git:///some/path.
388
    def __init__(self, transport, format, client, client_path):
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
389
        self._format = format
390
        self.root_transport = transport
391
        self.transport = transport
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
392
        self._mode_check_done = None
0.344.1 by Jelmer Vernooij
Allow using local git executable by accessing git:///some/path.
393
        self._client = client
0.200.1336 by Jelmer Vernooij
Support the git smart server http protocol.
394
        self._client_path = client_path
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
395
        self.base = self.root_transport.base
0.200.1434 by Jelmer Vernooij
Move refs access to control dir.
396
        self._refs = None
0.200.1335 by Jelmer Vernooij
Move _get_client.
397
0.322.1 by Jelmer Vernooij
Fix access of remote git branches.
398
    @property
399
    def _gitrepository_class(self):
400
        return RemoteGitRepository
401
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
402
    def archive(self, format, committish, write_data, progress=None,
7143.2.1 by Jelmer Vernooij
Don't hardcode the list of supported archive formats.
403
                write_error=None, subdirs=None, prefix=None):
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
404
        if progress is None:
405
            pb = ui.ui_factory.nested_progress_bar()
406
            progress = DefaultProgressReporter(pb).progress
407
        else:
408
            pb = None
7143.2.1 by Jelmer Vernooij
Don't hardcode the list of supported archive formats.
409
        def progress_wrapper(message):
410
            if message.startswith(b"fatal: Unknown archive format \'"):
411
                format = message.strip()[len(b"fatal: Unknown archive format '"):-1]
412
                raise errors.NoSuchExportFormat(format.decode('ascii'))
413
            return progress(message)
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
414
        try:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
415
            self._client.archive(
7143.2.1 by Jelmer Vernooij
Don't hardcode the list of supported archive formats.
416
                self._client_path, committish, write_data, progress_wrapper,
417
                write_error,
418
                format=(format.encode('ascii') if format else None),
419
                subdirs=subdirs,
420
                prefix=(prefix.encode('utf-8') if prefix else None))
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
421
        except GitProtocolError as e:
422
            raise parse_git_error(self.transport.external_url(), e)
423
        finally:
424
            if pb is not None:
425
                pb.finished()
426
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
427
    def fetch_pack(self, determine_wants, graph_walker, pack_data,
428
                   progress=None):
0.200.1335 by Jelmer Vernooij
Move _get_client.
429
        if progress is None:
0.405.1 by Jelmer Vernooij
Use same logic for interpreting progress reports everywhere.
430
            pb = ui.ui_factory.nested_progress_bar()
0.407.1 by Jelmer Vernooij
Improve progress reporting.
431
            progress = DefaultProgressReporter(pb).progress
0.405.1 by Jelmer Vernooij
Use same logic for interpreting progress reports everywhere.
432
        else:
433
            pb = None
0.200.1335 by Jelmer Vernooij
Move _get_client.
434
        try:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
435
            result = self._client.fetch_pack(
436
                self._client_path, determine_wants, graph_walker, pack_data,
437
                progress)
0.376.1 by Jelmer Vernooij
Add tests for remote operations.
438
            if result.refs is None:
439
                result.refs = {}
7143.15.2 by Jelmer Vernooij
Run autopep8.
440
            self._refs = remote_refs_dict_to_container(
441
                result.refs, result.symrefs)
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
442
            return result
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
443
        except GitProtocolError as e:
0.200.1335 by Jelmer Vernooij
Move _get_client.
444
            raise parse_git_error(self.transport.external_url(), e)
0.405.1 by Jelmer Vernooij
Use same logic for interpreting progress reports everywhere.
445
        finally:
446
            if pb is not None:
447
                pb.finished()
0.200.1335 by Jelmer Vernooij
Move _get_client.
448
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
449
    def send_pack(self, get_changed_refs, generate_pack_data, progress=None):
450
        if progress is None:
0.405.1 by Jelmer Vernooij
Use same logic for interpreting progress reports everywhere.
451
            pb = ui.ui_factory.nested_progress_bar()
0.407.1 by Jelmer Vernooij
Improve progress reporting.
452
            progress = DefaultProgressReporter(pb).progress
0.405.1 by Jelmer Vernooij
Use same logic for interpreting progress reports everywhere.
453
        else:
454
            pb = None
7143.15.2 by Jelmer Vernooij
Run autopep8.
455
0.419.1 by Jelmer Vernooij
Simplify pushing to Git directories.
456
        def get_changed_refs_wrapper(refs):
457
            # TODO(jelmer): This drops symref information
458
            self._refs = remote_refs_dict_to_container(refs)
459
            return get_changed_refs(refs)
0.200.1335 by Jelmer Vernooij
Move _get_client.
460
        try:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
461
            return self._client.send_pack(
462
                self._client_path, get_changed_refs_wrapper,
463
                generate_pack_data, progress)
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
464
        except GitProtocolError as e:
0.200.1335 by Jelmer Vernooij
Move _get_client.
465
            raise parse_git_error(self.transport.external_url(), e)
0.405.1 by Jelmer Vernooij
Use same logic for interpreting progress reports everywhere.
466
        finally:
467
            if pb is not None:
468
                pb.finished()
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
469
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
470
    def create_branch(self, name=None, repository=None,
471
                      append_revisions_only=None, ref=None):
472
        refname = self._get_selected_ref(name, ref)
473
        if refname != b'HEAD' and refname in self.get_refs_container():
474
            raise AlreadyBranchError(self.user_url)
475
        if refname in self.get_refs_container():
7143.15.2 by Jelmer Vernooij
Run autopep8.
476
            ref_chain, unused_sha = self.get_refs_container().follow(
477
                self._get_selected_ref(None))
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
478
            if ref_chain[0] == b'HEAD':
479
                refname = ref_chain[1]
480
        repo = self.open_repository()
481
        return RemoteGitBranch(self, repo, refname)
482
0.200.1393 by Jelmer Vernooij
Implement removal of remote branches.
483
    def destroy_branch(self, name=None):
484
        refname = self._get_selected_ref(name)
7143.15.2 by Jelmer Vernooij
Run autopep8.
485
0.200.1393 by Jelmer Vernooij
Implement removal of remote branches.
486
        def get_changed_refs(old_refs):
7240.3.1 by Jelmer Vernooij
When sending refs to a remote server, don't send a copy of the old refs.
487
            ret = {}
7240.3.2 by Jelmer Vernooij
Fix tests.
488
            if refname not in old_refs:
0.200.1395 by Jelmer Vernooij
Fix error reporting.
489
                raise NotBranchError(self.user_url)
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
490
            ret[refname] = dulwich.client.ZERO_SHA
0.200.1393 by Jelmer Vernooij
Implement removal of remote branches.
491
            return ret
7143.15.2 by Jelmer Vernooij
Run autopep8.
492
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
493
        def generate_pack_data(have, want, ofs_delta=False):
494
            return pack_objects_to_data([])
495
        self.send_pack(get_changed_refs, generate_pack_data)
0.200.1393 by Jelmer Vernooij
Implement removal of remote branches.
496
0.200.1068 by Jelmer Vernooij
Implement user_url/control_url.
497
    @property
498
    def user_url(self):
499
        return self.control_url
500
0.200.1314 by Jelmer Vernooij
Provide RemoteGitDir.user_transport.
501
    @property
502
    def user_transport(self):
503
        return self.root_transport
504
0.200.1395 by Jelmer Vernooij
Fix error reporting.
505
    @property
506
    def control_url(self):
507
        return self.control_transport.base
508
509
    @property
510
    def control_transport(self):
511
        return self.root_transport
512
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
513
    def open_repository(self):
0.200.1415 by Jelmer Vernooij
Fix lock files for remote directories.
514
        return RemoteGitRepository(self)
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
515
7142.3.1 by Jelmer Vernooij
Support .nick on remote branches and fix get_branch_reference.
516
    def get_branch_reference(self, name=None):
517
        ref = branch_name_to_ref(name)
518
        val = self.get_refs_container().read_ref(ref)
519
        if val.startswith(SYMREF):
520
            return val[len(SYMREF):]
521
        return None
522
0.200.1310 by Jelmer Vernooij
Add _get_selected_ref method.
523
    def open_branch(self, name=None, unsupported=False,
7143.15.2 by Jelmer Vernooij
Run autopep8.
524
                    ignore_fallbacks=False, ref=None, possible_transports=None,
525
                    nascent_ok=False):
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
526
        repo = self.open_repository()
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
527
        ref = self._get_selected_ref(name, ref)
7143.2.1 by Jelmer Vernooij
Don't hardcode the list of supported archive formats.
528
        try:
529
            if not nascent_ok and ref not in self.get_refs_container():
7143.16.10 by Jelmer Vernooij
Fix E128.
530
                raise NotBranchError(
531
                    self.root_transport.base, controldir=self)
7143.2.1 by Jelmer Vernooij
Don't hardcode the list of supported archive formats.
532
        except NotGitRepository:
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
533
            raise NotBranchError(self.root_transport.base,
7143.15.2 by Jelmer Vernooij
Run autopep8.
534
                                 controldir=self)
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
535
        ref_chain, unused_sha = self.get_refs_container().follow(ref)
536
        return RemoteGitBranch(self, repo, ref_chain[-1])
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
537
0.200.662 by Jelmer Vernooij
Deal with recommend_upgrade argument to open_workingtree.
538
    def open_workingtree(self, recommend_upgrade=False):
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
539
        raise NotLocalUrl(self.transport.base)
540
0.310.4 by Jelmer Vernooij
Implement RemoteControlDir.has_workingtree.
541
    def has_workingtree(self):
542
        return False
543
0.200.1489 by Jelmer Vernooij
More fixes to peel handling.
544
    def get_peeled(self, name):
545
        return self.get_refs_container().get_peeled(name)
546
0.200.1487 by Jelmer Vernooij
Use peeling.
547
    def get_refs_container(self):
0.200.1434 by Jelmer Vernooij
Move refs access to control dir.
548
        if self._refs is not None:
549
            return self._refs
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
550
        result = self.fetch_pack(lambda x: None, None,
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
551
                                 lambda x: None,
552
                                 lambda x: trace.mutter("git: %s" % x))
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
553
        self._refs = remote_refs_dict_to_container(
7143.15.2 by Jelmer Vernooij
Run autopep8.
554
            result.refs, result.symrefs)
0.200.1434 by Jelmer Vernooij
Move refs access to control dir.
555
        return self._refs
556
0.401.4 by Jelmer Vernooij
Implement RemoteGitDir.push_branch.
557
    def push_branch(self, source, revision_id=None, overwrite=False,
558
                    remember=False, create_prefix=False, lossy=False,
559
                    name=None):
560
        """Push the source branch into this ControlDir."""
561
        if revision_id is None:
562
            # No revision supplied by the user, default to the branch
563
            # revision
564
            revision_id = source.last_revision()
565
0.406.1 by Jelmer Vernooij
Properly lookup revnos for brz-git push result.
566
        push_result = GitPushResult()
0.401.4 by Jelmer Vernooij
Implement RemoteGitDir.push_branch.
567
        push_result.workingtree_updated = None
568
        push_result.master_branch = None
569
        push_result.source_branch = source
570
        push_result.stacked_on = None
571
        push_result.branch_push_result = None
572
        repo = self.find_repository()
573
        refname = self._get_selected_ref(name)
0.407.1 by Jelmer Vernooij
Improve progress reporting.
574
        if isinstance(source, GitBranch) and lossy:
575
            raise errors.LossyPushToSameVCS(source.controldir, self)
0.401.4 by Jelmer Vernooij
Implement RemoteGitDir.push_branch.
576
        source_store = get_object_store(source.repository)
7289.1.2 by Jelmer Vernooij
Fix pushing of tags as part of nascent git branches.
577
        fetch_tags = source.get_config_stack().get('branch.fetch_tags')
578
        def get_changed_refs(refs):
579
            self._refs = remote_refs_dict_to_container(refs)
580
            ret = {}
581
            # TODO(jelmer): Unpeel if necessary
582
            push_result.new_original_revid = revision_id
583
            if lossy:
584
                new_sha = source_store._lookup_revision_sha1(revision_id)
585
            else:
586
                try:
587
                    new_sha = repo.lookup_bzr_revision_id(revision_id)[0]
588
                except errors.NoSuchRevision:
589
                    raise errors.NoRoundtrippingSupport(
590
                        source, self.open_branch(name=name, nascent_ok=True))
591
            if not overwrite:
592
                if remote_divergence(ret.get(refname), new_sha,
593
                                     source_store):
594
                    raise DivergedBranches(
595
                        source, self.open_branch(name, nascent_ok=True))
596
            ret[refname] = new_sha
597
            if fetch_tags:
7289.1.5 by Jelmer Vernooij
Fix flake8 warning.
598
                for tagname, revid in viewitems(source.tags.get_tag_dict()):
7289.1.2 by Jelmer Vernooij
Fix pushing of tags as part of nascent git branches.
599
                    if lossy:
600
                        new_sha = source_store._lookup_revision_sha1(revid)
601
                    else:
602
                        try:
603
                            new_sha = repo.lookup_bzr_revision_id(revid)[0]
604
                        except errors.NoSuchRevision:
605
                            continue
7289.1.5 by Jelmer Vernooij
Fix flake8 warning.
606
                    ret[tag_name_to_ref(tagname)] = new_sha
7289.1.2 by Jelmer Vernooij
Fix pushing of tags as part of nascent git branches.
607
            return ret
0.403.3 by Jelmer Vernooij
Test RemoteGitDir.push_branch.
608
        with source_store.lock_read():
609
            if lossy:
610
                generate_pack_data = source_store.generate_lossy_pack_data
611
            else:
612
                generate_pack_data = source_store.generate_pack_data
613
            new_refs = self.send_pack(get_changed_refs, generate_pack_data)
0.401.4 by Jelmer Vernooij
Implement RemoteGitDir.push_branch.
614
        push_result.new_revid = repo.lookup_foreign_revision_id(
7143.15.2 by Jelmer Vernooij
Run autopep8.
615
            new_refs[refname])
0.403.3 by Jelmer Vernooij
Test RemoteGitDir.push_branch.
616
        try:
617
            old_remote = self._refs[refname]
618
        except KeyError:
619
            old_remote = ZERO_SHA
620
        push_result.old_revid = repo.lookup_foreign_revision_id(old_remote)
621
        self._refs = remote_refs_dict_to_container(new_refs)
0.401.4 by Jelmer Vernooij
Implement RemoteGitDir.push_branch.
622
        push_result.target_branch = self.open_branch(name)
0.403.3 by Jelmer Vernooij
Test RemoteGitDir.push_branch.
623
        if old_remote != ZERO_SHA:
624
            push_result.branch_push_result = GitBranchPushResult()
625
            push_result.branch_push_result.source_branch = source
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
626
            push_result.branch_push_result.target_branch = (
627
                push_result.target_branch)
0.403.3 by Jelmer Vernooij
Test RemoteGitDir.push_branch.
628
            push_result.branch_push_result.local_branch = None
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
629
            push_result.branch_push_result.master_branch = (
630
                push_result.target_branch)
0.403.3 by Jelmer Vernooij
Test RemoteGitDir.push_branch.
631
            push_result.branch_push_result.old_revid = push_result.old_revid
632
            push_result.branch_push_result.new_revid = push_result.new_revid
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
633
            push_result.branch_push_result.new_original_revid = (
634
                push_result.new_original_revid)
0.401.4 by Jelmer Vernooij
Implement RemoteGitDir.push_branch.
635
        if source.get_push_location() is None or remember:
636
            source.set_push_location(push_result.target_branch.base)
637
        return push_result
638
0.409.1 by Jelmer Vernooij
Don't probe for commondir over remote transport.
639
    def _find_commondir(self):
640
        # There is no way to find the commondir, if there is any.
641
        return self
642
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
643
0.225.2 by Jelmer Vernooij
Handle situation when repository is already up to date during pull.
644
class EmptyObjectStoreIterator(dict):
645
646
    def iterobjects(self):
647
        return []
648
649
0.200.218 by Jelmer Vernooij
Simplify TemporaryPack implementation.
650
class TemporaryPackIterator(Pack):
651
0.200.226 by Jelmer Vernooij
Merge thin-pack work.
652
    def __init__(self, path, resolve_ext_ref):
0.279.1 by William Grant
Support thin packs in fetch_pack and send_pack, since dulwich now handles them properly.
653
        super(TemporaryPackIterator, self).__init__(
654
            path, resolve_ext_ref=resolve_ext_ref)
0.278.2 by William Grant
Also override _idx_load rather than index, to be a bit cleaner.
655
        self._idx_load = lambda: self._idx_load_or_generate(self._idx_path)
0.200.226 by Jelmer Vernooij
Merge thin-pack work.
656
0.278.2 by William Grant
Also override _idx_load rather than index, to be a bit cleaner.
657
    def _idx_load_or_generate(self, path):
658
        if not os.path.exists(path):
7143.22.2 by Jelmer Vernooij
use more context libs for progress bars.
659
            with ui.ui_factory.nested_progress_bar() as pb:
0.278.2 by William Grant
Also override _idx_load rather than index, to be a bit cleaner.
660
                def report_progress(cur, total):
661
                    pb.update("generating index", cur, total)
7143.22.3 by Jelmer Vernooij
merge trunk.
662
                self.data.create_index(path, progress=report_progress)
0.278.2 by William Grant
Also override _idx_load rather than index, to be a bit cleaner.
663
        return load_pack_index(path)
0.200.205 by Jelmer Vernooij
Fix remote fetching.
664
665
    def __del__(self):
0.200.611 by Jelmer Vernooij
Merge warning fix from Naoki.
666
        if self._idx is not None:
0.241.1 by Naoki INADA
Fix can't delete tempfile on Windows
667
            self._idx.close()
668
            os.remove(self._idx_path)
0.200.611 by Jelmer Vernooij
Merge warning fix from Naoki.
669
        if self._data is not None:
0.241.1 by Naoki INADA
Fix can't delete tempfile on Windows
670
            self._data.close()
671
            os.remove(self._data_path)
0.200.205 by Jelmer Vernooij
Fix remote fetching.
672
673
0.200.1337 by Jelmer Vernooij
Re-use http connection if possible.
674
class BzrGitHttpClient(dulwich.client.HttpGitClient):
675
676
    def __init__(self, transport, *args, **kwargs):
677
        self.transport = transport
7268.10.2 by Jelmer Vernooij
Strip username.
678
        url = urlutils.URL.from_string(transport.external_url())
679
        url.user = url.quoted_user = None
680
        url.password = url.quoted_password = None
7371.3.2 by Jelmer Vernooij
Fix URL parsing for Git.
681
        url = urlutils.split_segment_parameters(str(url))[0]
682
        super(BzrGitHttpClient, self).__init__(url, *args, **kwargs)
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
683
684
    def _http_request(self, url, headers=None, data=None,
685
                      allow_compression=False):
686
        """Perform HTTP request.
687
688
        :param url: Request URL.
689
        :param headers: Optional custom headers to override defaults.
690
        :param data: Request data.
691
        :param allow_compression: Allow GZipped communication.
692
        :return: Tuple (`response`, `read`), where response is an `urllib3`
7140.1.1 by Jelmer Vernooij
Rollback https://code.launchpad.net/~jelmer/brz/python3-git-fix-http/+merge/356238
693
            response object with additional `content_type` and
694
            `redirect_location` properties, and `read` is a consumable read
695
            method for the response data.
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
696
        """
7359.1.1 by Jelmer Vernooij
Only set user agent for GitHub.
697
        if is_github_url(url):
698
            headers['User-agent'] = user_agent_for_github()
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
699
        headers["Pragma"] = "no-cache"
700
        if allow_compression:
701
            headers["Accept-Encoding"] = "gzip"
702
        else:
703
            headers["Accept-Encoding"] = "identity"
704
7296.2.2 by Jelmer Vernooij
Add a urllib3-like interface.
705
        response = self.transport.request(
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
706
            ('GET' if data is None else 'POST'),
7320.1.1 by Jelmer Vernooij
Fix git http support.
707
            url,
7296.2.2 by Jelmer Vernooij
Add a urllib3-like interface.
708
            body=data,
709
            headers=headers, retries=8)
710
711
        if response.status == 404:
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
712
            raise NotGitRepository()
7296.2.2 by Jelmer Vernooij
Add a urllib3-like interface.
713
        elif response.status != 200:
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
714
            raise GitProtocolError("unexpected http resp %d for %s" %
715
                                   (response.code, url))
716
717
        # TODO: Optimization available by adding `preload_content=False` to the
718
        # request and just passing the `read` method on instead of going via
719
        # `BytesIO`, if we can guarantee that the entire response is consumed
720
        # before issuing the next to still allow for connection reuse from the
721
        # pool.
722
        if response.getheader("Content-Encoding") == "gzip":
723
            read = gzip.GzipFile(fileobj=response).read
724
        else:
725
            read = response.read
726
727
        class WrapResponse(object):
728
729
            def __init__(self, response):
730
                self._response = response
7320.1.1 by Jelmer Vernooij
Fix git http support.
731
                self.status = response.status
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
732
                self.content_type = response.getheader("Content-Type")
7320.1.1 by Jelmer Vernooij
Fix git http support.
733
                self.redirect_location = response._actual.geturl()
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
734
7143.2.1 by Jelmer Vernooij
Don't hardcode the list of supported archive formats.
735
            def readlines(self):
736
                return self._response.readlines()
737
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
738
            def close(self):
7320.1.1 by Jelmer Vernooij
Fix git http support.
739
                pass
0.409.2 by Jelmer Vernooij
call out to HTTP transport rather than creating new connection.
740
741
        return WrapResponse(response), read
0.200.1337 by Jelmer Vernooij
Re-use http connection if possible.
742
743
7371.3.2 by Jelmer Vernooij
Fix URL parsing for Git.
744
def _git_url_and_path_from_transport(external_url):
7371.3.3 by Jelmer Vernooij
Fix tests.
745
    url, _ = urlutils.split_segment_parameters(external_url)
7371.3.2 by Jelmer Vernooij
Fix URL parsing for Git.
746
    return urlparse.urlsplit(url)
747
748
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
749
class RemoteGitControlDirFormat(GitControlDirFormat):
750
    """The .git directory control format."""
751
752
    supports_workingtrees = False
753
754
    @classmethod
755
    def _known_formats(self):
756
        return set([RemoteGitControlDirFormat()])
757
0.295.1 by Jelmer Vernooij
Split up branch formats.
758
    def get_branch_format(self):
759
        return RemoteGitBranchFormat()
760
7290.20.3 by Jelmer Vernooij
Fix tests for git/full history branches.
761
    @property
762
    def repository_format(self):
763
        return GitRepositoryFormat()
764
0.200.1413 by Jelmer Vernooij
Fix is_initializable()
765
    def is_initializable(self):
766
        return False
767
768
    def is_supported(self):
769
        return True
770
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
771
    def open(self, transport, _found=None):
772
        """Open this directory.
773
774
        """
7371.3.2 by Jelmer Vernooij
Fix URL parsing for Git.
775
        split_url = _git_url_and_path_from_transport(transport.external_url())
0.200.1336 by Jelmer Vernooij
Support the git smart server http protocol.
776
        if isinstance(transport, GitSmartTransport):
0.344.1 by Jelmer Vernooij
Allow using local git executable by accessing git:///some/path.
777
            client = transport._get_client()
7371.3.2 by Jelmer Vernooij
Fix URL parsing for Git.
778
        elif split_url.scheme in ("http", "https"):
0.344.1 by Jelmer Vernooij
Allow using local git executable by accessing git:///some/path.
779
            client = BzrGitHttpClient(transport)
7380.1.1 by Jelmer Vernooij
Several more fixes for git merge proposals.
780
        elif split_url.scheme in ('file', ):
0.344.1 by Jelmer Vernooij
Allow using local git executable by accessing git:///some/path.
781
            client = dulwich.client.LocalGitClient()
0.200.1336 by Jelmer Vernooij
Support the git smart server http protocol.
782
        else:
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
783
            raise NotBranchError(transport.base)
0.344.1 by Jelmer Vernooij
Allow using local git executable by accessing git:///some/path.
784
        if not _found:
7143.15.2 by Jelmer Vernooij
Run autopep8.
785
            pass  # TODO(jelmer): Actually probe for something
7371.3.2 by Jelmer Vernooij
Fix URL parsing for Git.
786
        return RemoteGitDir(transport, self, client, split_url.path)
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
787
788
    def get_format_description(self):
789
        return "Remote Git Repository"
790
791
    def initialize_on_transport(self, transport):
792
        raise UninitializableFormat(self)
793
0.200.1412 by Jelmer Vernooij
Implement GitControlDirFormat.supports_transport.
794
    def supports_transport(self, transport):
795
        try:
796
            external_url = transport.external_url()
797
        except InProcessTransport:
798
            raise NotBranchError(path=transport.base)
7143.15.2 by Jelmer Vernooij
Run autopep8.
799
        return (external_url.startswith("http:")
800
                or external_url.startswith("https:")
801
                or external_url.startswith("git+")
802
                or external_url.startswith("git:"))
0.200.1412 by Jelmer Vernooij
Implement GitControlDirFormat.supports_transport.
803
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
804
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
805
class GitRemoteRevisionTree(RevisionTree):
806
6968.4.4 by Jelmer Vernooij
Update for API changes from archive branch.
807
    def archive(self, format, name, root=None, subdir=None, force_mtime=None):
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
808
        """Create an archive of this tree.
809
6968.4.4 by Jelmer Vernooij
Update for API changes from archive branch.
810
        :param format: Format name (e.g. 'tar')
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
811
        :param name: target file name
812
        :param root: Root directory name (or None)
813
        :param subdir: Subdirectory to export (or None)
814
        :return: Iterator over archive chunks
815
        """
816
        commit = self._repository.lookup_bzr_revision_id(
817
            self.get_revision_id())[0]
6968.4.4 by Jelmer Vernooij
Update for API changes from archive branch.
818
        f = tempfile.SpooledTemporaryFile()
819
        # git-upload-archive(1) generaly only supports refs. So let's see if we
820
        # can find one.
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
821
        reverse_refs = {
7143.15.2 by Jelmer Vernooij
Run autopep8.
822
            v: k for (k, v) in
823
            self._repository.controldir.get_refs_container().as_dict().items()}
6968.4.4 by Jelmer Vernooij
Update for API changes from archive branch.
824
        try:
825
            committish = reverse_refs[commit]
826
        except KeyError:
827
            # No? Maybe the user has uploadArchive.allowUnreachable enabled.
828
            # Let's hope for the best.
829
            committish = commit
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
830
        self._repository.archive(
7143.15.2 by Jelmer Vernooij
Run autopep8.
831
            format, committish, f.write,
832
            subdirs=([subdir] if subdir else None),
833
            prefix=(root + '/') if root else '')
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
834
        f.seek(0)
6968.4.4 by Jelmer Vernooij
Update for API changes from archive branch.
835
        return osutils.file_iterator(f)
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
836
7192.5.1 by Jelmer Vernooij
Remove more file ids.
837
    def is_versioned(self, path):
7143.2.1 by Jelmer Vernooij
Don't hardcode the list of supported archive formats.
838
        raise GitSmartRemoteNotSupported(self.is_versioned, self)
839
840
    def has_filename(self, path):
841
        raise GitSmartRemoteNotSupported(self.has_filename, self)
842
7192.5.1 by Jelmer Vernooij
Remove more file ids.
843
    def get_file_text(self, path):
7143.2.1 by Jelmer Vernooij
Don't hardcode the list of supported archive formats.
844
        raise GitSmartRemoteNotSupported(self.get_file_text, self)
845
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
846
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
847
class RemoteGitRepository(GitRepository):
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
848
7254.5.1 by Jelmer Vernooij
Add supports_random_access attribute to repositories.
849
    supports_random_access = False
850
0.200.319 by Jelmer Vernooij
Print proper error when trying unsupported operations against a git server.
851
    @property
0.200.1068 by Jelmer Vernooij
Implement user_url/control_url.
852
    def user_url(self):
853
        return self.control_url
854
0.200.1288 by Jelmer Vernooij
Properly raise GitRemoteNotSupported from RemoteGitRepository.
855
    def get_parent_map(self, revids):
0.200.1398 by Jelmer Vernooij
Make GitSmartRemoteNotSupported derive from UnsupportedOperation.
856
        raise GitSmartRemoteNotSupported(self.get_parent_map, self)
0.200.319 by Jelmer Vernooij
Print proper error when trying unsupported operations against a git server.
857
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
858
    def archive(self, *args, **kwargs):
859
        return self.controldir.archive(*args, **kwargs)
860
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
861
    def fetch_pack(self, determine_wants, graph_walker, pack_data,
0.200.155 by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories.
862
                   progress=None):
7143.2.1 by Jelmer Vernooij
Don't hardcode the list of supported archive formats.
863
        return self.controldir.fetch_pack(
7143.16.8 by Jelmer Vernooij
Fix E126
864
            determine_wants, graph_walker, pack_data, progress)
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
865
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
866
    def send_pack(self, get_changed_refs, generate_pack_data):
867
        return self.controldir.send_pack(get_changed_refs, generate_pack_data)
0.200.427 by Jelmer Vernooij
make send_pack accessible.
868
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
869
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
870
                      progress=None):
0.200.167 by Jelmer Vernooij
Implement fetch_objects properly.
871
        fd, path = tempfile.mkstemp(suffix=".pack")
0.200.1299 by Jelmer Vernooij
Make sure file gets closed.
872
        try:
873
            self.fetch_pack(determine_wants, graph_walker,
7143.15.2 by Jelmer Vernooij
Run autopep8.
874
                            lambda x: os.write(fd, x), progress)
0.200.1299 by Jelmer Vernooij
Make sure file gets closed.
875
        finally:
876
            os.close(fd)
0.200.226 by Jelmer Vernooij
Merge thin-pack work.
877
        if os.path.getsize(path) == 0:
0.225.2 by Jelmer Vernooij
Handle situation when repository is already up to date during pull.
878
            return EmptyObjectStoreIterator()
0.200.226 by Jelmer Vernooij
Merge thin-pack work.
879
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
0.200.167 by Jelmer Vernooij
Implement fetch_objects properly.
880
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
881
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
882
        # This won't work for any round-tripped bzr revisions, but it's a
883
        # start..
0.200.415 by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories.
884
        try:
885
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
886
        except InvalidRevisionId:
887
            raise NoSuchRevision(self, bzr_revid)
888
0.252.48 by Jelmer Vernooij
Implement lookup_foreign_revision for remote branches.
889
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
890
        """Lookup a revision id.
891
892
        """
893
        if mapping is None:
894
            mapping = self.get_mapping()
895
        # Not really an easy way to parse foreign revids here..
896
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
897
0.200.1446 by Jelmer Vernooij
Add stub for RemoteGitRepository.revision_tree.
898
    def revision_tree(self, revid):
6968.4.1 by Jelmer Vernooij
Add support for exporting archives in Git.
899
        return GitRemoteRevisionTree(self, revid)
0.200.1446 by Jelmer Vernooij
Add stub for RemoteGitRepository.revision_tree.
900
0.200.1481 by Jelmer Vernooij
'Implement' RemoteGitRepository.get_revisions.
901
    def get_revisions(self, revids):
902
        raise GitSmartRemoteNotSupported(self.get_revisions, self)
903
0.200.1557 by Jelmer Vernooij
Implement RemoteGitRepository.has_revisions.
904
    def has_revisions(self, revids):
905
        raise GitSmartRemoteNotSupported(self.get_revisions, self)
906
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
907
0.200.1064 by Jelmer Vernooij
Use common base class for tags.
908
class RemoteGitTagDict(GitTags):
0.228.3 by Jelmer Vernooij
Fix tags when fetching from remotes.
909
910
    def set_tag(self, name, revid):
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
911
        sha = self.branch.lookup_bzr_revision_id(revid)[0]
912
        self._set_ref(name, sha)
913
914
    def delete_tag(self, name):
915
        self._set_ref(name, dulwich.client.ZERO_SHA)
916
917
    def _set_ref(self, name, sha):
918
        ref = tag_name_to_ref(name)
7143.15.2 by Jelmer Vernooij
Run autopep8.
919
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
920
        def get_changed_refs(old_refs):
7240.3.1 by Jelmer Vernooij
When sending refs to a remote server, don't send a copy of the old refs.
921
            ret = {}
7240.3.2 by Jelmer Vernooij
Fix tests.
922
            if sha == dulwich.client.ZERO_SHA and ref not in old_refs:
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
923
                raise NoSuchTag(name)
924
            ret[ref] = sha
925
            return ret
7143.15.2 by Jelmer Vernooij
Run autopep8.
926
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
927
        def generate_pack_data(have, want, ofs_delta=False):
928
            return pack_objects_to_data([])
929
        self.repository.send_pack(get_changed_refs, generate_pack_data)
0.228.3 by Jelmer Vernooij
Fix tags when fetching from remotes.
930
931
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
932
class RemoteGitBranch(GitBranch):
933
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
934
    def __init__(self, controldir, repository, name):
0.200.919 by Jelmer Vernooij
Simplify ref handling in remote.py.
935
        self._sha = None
0.295.1 by Jelmer Vernooij
Split up branch formats.
936
        super(RemoteGitBranch, self).__init__(controldir, repository, name,
7143.15.2 by Jelmer Vernooij
Run autopep8.
937
                                              RemoteGitBranchFormat())
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
938
0.200.1317 by Jelmer Vernooij
Avoid NotImplementedError.
939
    def last_revision_info(self):
0.200.1398 by Jelmer Vernooij
Make GitSmartRemoteNotSupported derive from UnsupportedOperation.
940
        raise GitSmartRemoteNotSupported(self.last_revision_info, self)
0.200.1317 by Jelmer Vernooij
Avoid NotImplementedError.
941
0.200.1068 by Jelmer Vernooij
Implement user_url/control_url.
942
    @property
943
    def user_url(self):
944
        return self.control_url
945
946
    @property
947
    def control_url(self):
948
        return self.base
949
0.200.1436 by Jelmer Vernooij
Raise UnsupportedOperation for `Branch.revision_id_to_dotted_revno`,
950
    def revision_id_to_revno(self, revision_id):
951
        raise GitSmartRemoteNotSupported(self.revision_id_to_revno, self)
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
952
953
    def last_revision(self):
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
954
        return self.lookup_foreign_revision_id(self.head)
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
955
956
    @property
957
    def head(self):
0.200.919 by Jelmer Vernooij
Simplify ref handling in remote.py.
958
        if self._sha is not None:
959
            return self._sha
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
960
        refs = self.controldir.get_refs_container()
0.200.1561 by Jelmer Vernooij
Some fixes for colocated branch handling.
961
        name = branch_name_to_ref(self.name)
0.200.1386 by Jelmer Vernooij
Friendlier message if HEAD is not found.
962
        try:
963
            self._sha = refs[name]
964
        except KeyError:
965
            raise NoSuchRef(name, self.repository.user_url, refs)
0.200.919 by Jelmer Vernooij
Simplify ref handling in remote.py.
966
        return self._sha
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
967
0.200.169 by Jelmer Vernooij
Fix branch cloning.
968
    def _synchronize_history(self, destination, revision_id):
969
        """See Branch._synchronize_history()."""
7143.12.1 by Jelmer Vernooij
Support cloning revisions referenced only by an annotated tag.
970
        if revision_id is None:
971
            revision_id = self.last_revision()
972
        destination.generate_revision_history(revision_id)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
973
0.289.1 by Jelmer Vernooij
No parent location for remote repos.
974
    def _get_parent_location(self):
975
        return None
976
0.200.499 by Jelmer Vernooij
Implement RemoteBranch.{get,set}_push_location.
977
    def get_push_location(self):
978
        return None
979
980
    def set_push_location(self, url):
981
        pass
0.200.1488 by Jelmer Vernooij
Factor out remote_refs_dict_to_container.
982
0.375.1 by Jelmer Vernooij
Fix remote tests, warn when fetching git->bzr and bzr->git.
983
    def _iter_tag_refs(self):
984
        """Iterate over the tag refs.
985
986
        :param refs: Refs dictionary (name -> git sha1)
987
        :return: iterator over (ref_name, tag_name, peeled_sha1, unpeeled_sha1)
988
        """
989
        refs = self.controldir.get_refs_container()
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
990
        for ref_name, unpeeled in refs.as_dict().items():
0.375.1 by Jelmer Vernooij
Fix remote tests, warn when fetching git->bzr and bzr->git.
991
            try:
992
                tag_name = ref_to_tag_name(ref_name)
993
            except (ValueError, UnicodeDecodeError):
994
                continue
995
            peeled = refs.get_peeled(ref_name)
996
            if peeled is None:
7058.4.36 by Jelmer Vernooij
Fix peeled error.
997
                # Let's just hope it's a commit
998
                peeled = unpeeled
6973.6.2 by Jelmer Vernooij
Fix more tests.
999
            if not isinstance(tag_name, text_type):
0.375.1 by Jelmer Vernooij
Fix remote tests, warn when fetching git->bzr and bzr->git.
1000
                raise TypeError(tag_name)
1001
            yield (ref_name, tag_name, peeled, unpeeled)
1002
7131.12.1 by Jelmer Vernooij
Support uncommit on remote git branches.
1003
    def set_last_revision_info(self, revno, revid):
1004
        self.generate_revision_history(revid)
1005
1006
    def generate_revision_history(self, revision_id, last_rev=None,
1007
                                  other_branch=None):
1008
        sha = self.lookup_bzr_revision_id(revision_id)[0]
1009
        def get_changed_refs(old_refs):
1010
            return {self.ref: sha}
1011
        def generate_pack_data(have, want, ofs_delta=False):
1012
            return pack_objects_to_data([])
1013
        self.repository.send_pack(get_changed_refs, generate_pack_data)
1014
        self._sha = sha
1015
0.200.1488 by Jelmer Vernooij
Factor out remote_refs_dict_to_container.
1016
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
1017
def remote_refs_dict_to_container(refs_dict, symrefs_dict={}):
0.200.1488 by Jelmer Vernooij
Factor out remote_refs_dict_to_container.
1018
    base = {}
1019
    peeled = {}
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
1020
    for k, v in refs_dict.items():
0.200.1488 by Jelmer Vernooij
Factor out remote_refs_dict_to_container.
1021
        if is_peeled(k):
1022
            peeled[k[:-3]] = v
1023
        else:
1024
            base[k] = v
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
1025
    for name, target in symrefs_dict.items():
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
1026
        base[name] = SYMREF + target
0.200.1488 by Jelmer Vernooij
Factor out remote_refs_dict_to_container.
1027
    ret = DictRefsContainer(base)
1028
    ret._peeled = peeled
1029
    return ret