/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 breezy/git/__init__.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 02:48:11 UTC
  • mfrom: (7143.7.1 unused-import)
  • Revision ID: breezy.the.bot@gmail.com-20181116024811-q2wd1lddpxizz25h
Remove some unused bzr-specific imports in breezy.git.

Merged from https://code.launchpad.net/~jelmer/brz/unused-import/+merge/358359

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/__init__.py
27
27
import os
28
28
import sys
29
29
 
30
 
dulwich_minimum_version = (0, 19, 0)
 
30
dulwich_minimum_version = (0, 19, 7)
31
31
 
32
32
from breezy.i18n import gettext
33
33
 
34
34
from .. import (
35
35
    __version__ as breezy_version,
36
 
    errors as bzr_errors,
 
36
    errors as brz_errors,
37
37
    trace,
38
38
    version_info,
39
39
    )
65
65
    try:
66
66
        from dulwich import __version__ as dulwich_version
67
67
    except ImportError:
68
 
        raise bzr_errors.DependencyNotPresent("dulwich",
 
68
        raise brz_errors.DependencyNotPresent("dulwich",
69
69
            "bzr-git: Please install dulwich, https://www.dulwich.io/")
70
70
    else:
71
71
        if dulwich_version < dulwich_minimum_version:
72
 
            raise bzr_errors.DependencyNotPresent("dulwich",
 
72
            raise brz_errors.DependencyNotPresent("dulwich",
73
73
                "bzr-git: Dulwich is too old; at least %d.%d.%d is required" %
74
74
                    dulwich_minimum_version)
75
75
 
105
105
    def probe_transport(self, transport):
106
106
        try:
107
107
            external_url = transport.external_url()
108
 
        except bzr_errors.InProcessTransport:
109
 
            raise bzr_errors.NotBranchError(path=transport.base)
 
108
        except brz_errors.InProcessTransport:
 
109
            raise brz_errors.NotBranchError(path=transport.base)
110
110
        if (external_url.startswith("http:") or
111
111
            external_url.startswith("https:")):
112
112
            # Already handled by RemoteGitProber
113
 
            raise bzr_errors.NotBranchError(path=transport.base)
 
113
            raise brz_errors.NotBranchError(path=transport.base)
114
114
        from .. import urlutils
115
115
        if urlutils.split(transport.base)[1] == ".git":
116
 
            raise bzr_errors.NotBranchError(path=transport.base)
 
116
            raise brz_errors.NotBranchError(path=transport.base)
117
117
        if not transport.has_any(['objects', '.git/objects', '.git']):
118
 
            raise bzr_errors.NotBranchError(path=transport.base)
 
118
            raise brz_errors.NotBranchError(path=transport.base)
119
119
        lazy_check_versions()
120
120
        from .dir import (
121
121
            BareLocalGitControlDirFormat,
125
125
            return LocalGitControlDirFormat()
126
126
        if transport.has('info') and transport.has('objects'):
127
127
            return BareLocalGitControlDirFormat()
128
 
        raise bzr_errors.NotBranchError(path=transport.base)
 
128
        raise brz_errors.NotBranchError(path=transport.base)
129
129
 
130
130
    @classmethod
131
131
    def known_formats(cls):
159
159
            req.add_header("User-Agent", user_agent_for_github())
160
160
        elif host == "bazaar.launchpad.net":
161
161
            # Don't attempt Git probes against bazaar.launchpad.net; pad.lv/1744830
162
 
            raise bzr_errors.NotBranchError(transport.base)
 
162
            raise brz_errors.NotBranchError(transport.base)
163
163
        resp = transport._perform(req)
164
164
        if resp.code in (404, 405):
165
 
            raise bzr_errors.NotBranchError(transport.base)
 
165
            raise brz_errors.NotBranchError(transport.base)
166
166
        headers = resp.headers
167
167
        ct = headers.get("Content-Type")
168
168
        if ct is None:
169
 
            raise bzr_errors.NotBranchError(transport.base)
 
169
            raise brz_errors.NotBranchError(transport.base)
170
170
        if ct.startswith("application/x-git"):
171
171
            from .remote import RemoteGitControlDirFormat
172
172
            return RemoteGitControlDirFormat()
181
181
    def probe_transport(self, transport):
182
182
        try:
183
183
            external_url = transport.external_url()
184
 
        except bzr_errors.InProcessTransport:
185
 
            raise bzr_errors.NotBranchError(path=transport.base)
 
184
        except brz_errors.InProcessTransport:
 
185
            raise brz_errors.NotBranchError(path=transport.base)
186
186
 
187
187
        if (external_url.startswith("http:") or
188
188
            external_url.startswith("https:")):
190
190
 
191
191
        if (not external_url.startswith("git://") and
192
192
            not external_url.startswith("git+")):
193
 
            raise bzr_errors.NotBranchError(transport.base)
 
193
            raise brz_errors.NotBranchError(transport.base)
194
194
 
195
195
        # little ugly, but works
196
196
        from .remote import (
199
199
            )
200
200
        if isinstance(transport, GitSmartTransport):
201
201
            return RemoteGitControlDirFormat()
202
 
        raise bzr_errors.NotBranchError(path=transport.base)
 
202
        raise brz_errors.NotBranchError(path=transport.base)
203
203
 
204
204
    @classmethod
205
205
    def known_formats(cls):
243
243
        if rev.mapping.vcs == foreign_vcs_git:
244
244
            return foreign_revid
245
245
        else:
246
 
            raise bzr_errors.InvalidRevisionId(rev.revision_id, None)
 
246
            raise brz_errors.InvalidRevisionId(rev.revision_id, None)
247
247
 
248
248
 
249
249
def update_stanza(rev, stanza):
250
250
    mapping = getattr(rev, "mapping", None)
251
251
    try:
252
252
        git_commit = extract_git_foreign_revid(rev)
253
 
    except bzr_errors.InvalidRevisionId:
 
253
    except brz_errors.InvalidRevisionId:
254
254
        pass
255
255
    else:
256
256
        stanza.add("git-commit", git_commit)
319
319
    __name__ + ".dir", "GitControlDirFormat")
320
320
 
321
321
 
322
 
try:
323
 
    from ..registry import register_lazy
324
 
except ImportError:
325
 
    from ..diff import format_registry as diff_format_registry
326
 
    diff_format_registry.register_lazy('git', __name__ + '.send',
327
 
        'GitDiffTree', 'Git am-style diff format')
328
 
 
329
 
    from ..send import (
330
 
        format_registry as send_format_registry,
331
 
        )
332
 
    send_format_registry.register_lazy('git', __name__ + '.send',
333
 
                                       'send_git', 'Git am-style diff format')
334
 
 
335
 
    from ..directory_service import directories
336
 
    directories.register_lazy('github:', __name__ + '.directory',
337
 
                              'GitHubDirectory',
338
 
                              'GitHub directory.')
339
 
    directories.register_lazy('git@github.com:', __name__ + '.directory',
340
 
                              'GitHubDirectory',
341
 
                              'GitHub directory.')
342
 
 
343
 
    from ..help_topics import (
344
 
        topic_registry,
345
 
        )
346
 
    topic_registry.register_lazy('git', __name__ + '.help', 'help_git',
347
 
        'Using Bazaar with Git')
348
 
 
349
 
    from ..foreign import (
350
 
        foreign_vcs_registry,
351
 
        )
352
 
    foreign_vcs_registry.register_lazy("git",
353
 
        __name__ + ".mapping", "foreign_vcs_git", "Stupid content tracker")
354
 
else:
355
 
    register_lazy("breezy.diff", "format_registry",
356
 
        'git', __name__ + '.send', 'GitDiffTree',
357
 
        'Git am-style diff format')
358
 
    register_lazy("breezy.send", "format_registry",
359
 
        'git', __name__ + '.send', 'send_git',
360
 
        'Git am-style diff format')
361
 
    register_lazy('breezy.directory_service', 'directories', 'github:',
362
 
            __name__ + '.directory', 'GitHubDirectory',
363
 
            'GitHub directory.')
364
 
    register_lazy('breezy.directory_service', 'directories',
365
 
            'git@github.com:', __name__ + '.directory',
366
 
            'GitHubDirectory', 'GitHub directory.')
367
 
    register_lazy('breezy.help_topics', 'topic_registry',
368
 
            'git', __name__ + '.help', 'help_git',
369
 
            'Using Bazaar with Git')
370
 
    register_lazy('breezy.foreign', 'foreign_vcs_registry', "git",
371
 
        __name__ + ".mapping", "foreign_vcs_git", "Stupid content tracker")
 
322
from ..diff import format_registry as diff_format_registry
 
323
diff_format_registry.register_lazy('git', __name__ + '.send',
 
324
    'GitDiffTree', 'Git am-style diff format')
 
325
 
 
326
from ..send import (
 
327
    format_registry as send_format_registry,
 
328
    )
 
329
send_format_registry.register_lazy('git', __name__ + '.send',
 
330
                                   'send_git', 'Git am-style diff format')
 
331
 
 
332
from ..directory_service import directories
 
333
directories.register_lazy('github:', __name__ + '.directory',
 
334
                          'GitHubDirectory',
 
335
                          'GitHub directory.')
 
336
directories.register_lazy('git@github.com:', __name__ + '.directory',
 
337
                          'GitHubDirectory',
 
338
                          'GitHub directory.')
 
339
 
 
340
from ..help_topics import (
 
341
    topic_registry,
 
342
    )
 
343
topic_registry.register_lazy('git', __name__ + '.help', 'help_git',
 
344
    'Using Bazaar with Git')
 
345
 
 
346
from ..foreign import (
 
347
    foreign_vcs_registry,
 
348
    )
 
349
foreign_vcs_registry.register_lazy("git",
 
350
    __name__ + ".mapping", "foreign_vcs_git", "Stupid content tracker")
 
351
 
372
352
 
373
353
def update_git_cache(repository, revid):
374
354
    """Update the git cache after a local commit."""
379
359
        return # No existing cache, don't bother updating
380
360
    try:
381
361
        lazy_check_versions()
382
 
    except bzr_errors.DependencyNotPresent as e:
 
362
    except brz_errors.DependencyNotPresent as e:
383
363
        # dulwich is probably missing. silently ignore
384
364
        trace.mutter("not updating git map for %r: %s",
385
365
            repository, e)