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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-23 01:17:33 UTC
  • mfrom: (7516.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200623011733-ohfy5ukvyehd2kpf
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/386223

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/repository.py
33
33
    ForeignRepository,
34
34
    )
35
35
 
36
 
from .commit import (
37
 
    GitCommitBuilder,
38
 
    )
39
36
from .filegraph import (
40
37
    GitFileLastChangeScanner,
41
38
    GitFileParentProvider,
100
97
            self._report_repo_results(verbose)
101
98
 
102
99
 
103
 
_optimisers_loaded = False
104
 
 
105
 
 
106
 
def lazy_load_optimisers():
107
 
    global _optimisers_loaded
108
 
    if _optimisers_loaded:
109
 
        return
110
 
    from . import interrepo
111
 
    for optimiser in [interrepo.InterRemoteGitNonGitRepository,
112
 
                      interrepo.InterLocalGitNonGitRepository,
113
 
                      interrepo.InterLocalGitLocalGitRepository,
114
 
                      interrepo.InterRemoteGitLocalGitRepository,
115
 
                      interrepo.InterToLocalGitRepository,
116
 
                      interrepo.InterToRemoteGitRepository,
117
 
                      ]:
118
 
        repository.InterRepository.register_optimiser(optimiser)
119
 
    _optimisers_loaded = True
 
100
for optimiser in ['InterRemoteGitNonGitRepository',
 
101
                  'InterLocalGitNonGitRepository',
 
102
                  'InterLocalGitLocalGitRepository',
 
103
                  'InterRemoteGitLocalGitRepository',
 
104
                  'InterToLocalGitRepository',
 
105
                  'InterToRemoteGitRepository',
 
106
                  ]:
 
107
    repository.InterRepository.register_lazy_optimiser(
 
108
        'breezy.git.interrepo', optimiser)
120
109
 
121
110
 
122
111
class GitRepository(ForeignRepository):
131
120
        super(GitRepository, self).__init__(GitRepositoryFormat(),
132
121
                                            gitdir, control_files=None)
133
122
        self.base = gitdir.root_transport.base
134
 
        lazy_load_optimisers()
135
123
        self._lock_mode = None
136
124
        self._lock_count = 0
137
125
 
259
247
        :param lossy: Whether to discard data that can not be natively
260
248
            represented, when pushing to a foreign VCS
261
249
        """
 
250
        from .commit import (
 
251
            GitCommitBuilder,
 
252
            )
262
253
        builder = GitCommitBuilder(
263
254
            self, parents, config, timestamp, timezone, committer, revprops,
264
255
            revision_id, lossy)