/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: 2018-11-16 18:59:44 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116185944-biefv1sub37qfybm
Sprinkle some PEP8iness.

Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/repository.py
105
105
    def check(self, callback_refs=None, check_repo=True):
106
106
        if callback_refs is None:
107
107
            callback_refs = {}
108
 
        with self.repository.lock_read(), ui.ui_factory.nested_progress_bar() as self.progress:
 
108
        with self.repository.lock_read(), \
 
109
                ui.ui_factory.nested_progress_bar() as self.progress:
109
110
            shas = set(self.repository._git.object_store)
110
111
            self.object_count = len(shas)
111
112
            # TODO(jelmer): Check more things
132
133
 
133
134
_optimisers_loaded = False
134
135
 
 
136
 
135
137
def lazy_load_optimisers():
136
138
    global _optimisers_loaded
137
139
    if _optimisers_loaded:
158
160
    def __init__(self, gitdir):
159
161
        self._transport = gitdir.root_transport
160
162
        super(GitRepository, self).__init__(GitRepositoryFormat(),
161
 
            gitdir, control_files=None)
 
163
                                            gitdir, control_files=None)
162
164
        self.base = gitdir.root_transport.base
163
165
        lazy_load_optimisers()
164
166
        self._lock_mode = None
166
168
 
167
169
    def add_fallback_repository(self, basis_url):
168
170
        raise errors.UnstackableRepositoryFormat(self._format,
169
 
            self.control_transport.base)
 
171
                                                 self.control_transport.base)
170
172
 
171
173
    def is_shared(self):
172
174
        return False
287
289
        :param lossy: Whether to discard data that can not be natively
288
290
            represented, when pushing to a foreign VCS
289
291
        """
290
 
        builder = GitCommitBuilder(self, parents, config,
291
 
                timestamp, timezone, committer, revprops, revision_id,
292
 
                lossy)
 
292
        builder = GitCommitBuilder(
 
293
            self, parents, config, timestamp, timezone, committer, revprops,
 
294
            revision_id, lossy)
293
295
        self.start_write_group()
294
296
        return builder
295
297
 
354
356
 
355
357
    def gather_stats(self, revid=None, committers=None):
356
358
        """See Repository.gather_stats()."""
357
 
        result = super(LocalGitRepository, self).gather_stats(revid, committers)
 
359
        result = super(LocalGitRepository, self).gather_stats(
 
360
            revid, committers)
358
361
        revs = []
359
362
        for sha in self._git.object_store:
360
363
            o = self._git.object_store[sha]
369
372
            o = self._git.object_store[sha]
370
373
            if not isinstance(o, Commit):
371
374
                continue
372
 
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
373
 
                mapping.revision_id_foreign_to_bzr)
 
375
            rev, roundtrip_revid, verifiers = mapping.import_commit(
 
376
                o, mapping.revision_id_foreign_to_bzr)
374
377
            yield o.id, rev.revision_id, roundtrip_revid
375
378
 
376
379
    def all_revision_ids(self):
408
411
    def get_parent_map(self, revids, no_alternates=False):
409
412
        parent_map = {}
410
413
        for revision_id in revids:
411
 
            parents = self._get_parents(revision_id, no_alternates=no_alternates)
 
414
            parents = self._get_parents(
 
415
                revision_id, no_alternates=no_alternates)
412
416
            if revision_id == _mod_revision.NULL_REVISION:
413
417
                parent_map[revision_id] = ()
414
418
                continue
474
478
        commit = self._git.object_store.peel_sha(foreign_revid)
475
479
        if not isinstance(commit, Commit):
476
480
            raise NotCommitError(commit.id)
477
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(commit,
478
 
            mapping.revision_id_foreign_to_bzr)
 
481
        rev, roundtrip_revid, verifiers = mapping.import_commit(
 
482
            commit, mapping.revision_id_foreign_to_bzr)
479
483
        # FIXME: check testament before doing this?
480
484
        if roundtrip_revid:
481
485
            return roundtrip_revid
516
520
            without_sig = Commit.from_string(commit.as_raw_string())
517
521
            without_sig.gpgsig = None
518
522
 
519
 
            (result, key, plain_text) = gpg_strategy.verify(without_sig.as_raw_string(), commit.gpgsig)
 
523
            (result, key, plain_text) = gpg_strategy.verify(
 
524
                without_sig.as_raw_string(), commit.gpgsig)
520
525
            return (result, key)
521
526
 
522
527
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
528
533
            details
529
534
        """
530
535
        try:
531
 
            (git_sha, mapping) = mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
536
            (git_sha, mapping) = mapping_registry.revision_id_bzr_to_foreign(
 
537
                bzr_revid)
532
538
        except errors.InvalidRevisionId:
533
539
            if mapping is None:
534
540
                mapping = self.get_mapping()
540
546
                # FIXME: Hitting this a lot will be very inefficient...
541
547
                pb = ui.ui_factory.nested_progress_bar()
542
548
                try:
543
 
                    for i, (git_sha, revid, roundtrip_revid) in enumerate(self._iter_revision_ids()):
 
549
                    for i, (git_sha, revid, roundtrip_revid) in enumerate(
 
550
                            self._iter_revision_ids()):
544
551
                        if not roundtrip_revid:
545
552
                            continue
546
553
                        pb.update("resolving revision id", i)
623
630
            required_trees.update(revision.parent_ids[:1])
624
631
 
625
632
        trees = dict((t.get_revision_id(), t) for
626
 
            t in self.revision_trees(required_trees))
 
633
                     t in self.revision_trees(required_trees))
627
634
 
628
635
        # Calculate the deltas
629
636
        for revision in revisions:
633
640
                old_tree = trees[revision.parent_ids[0]]
634
641
            new_tree = trees[revision.revision_id]
635
642
            if specific_fileids is not None:
636
 
                specific_files = [new_tree.id2path(fid) for fid in specific_fileids]
 
643
                specific_files = [new_tree.id2path(
 
644
                    fid) for fid in specific_fileids]
637
645
            else:
638
646
                specific_files = None
639
 
            yield new_tree.changes_from(old_tree, specific_files=specific_files)
 
647
            yield new_tree.changes_from(
 
648
                old_tree, specific_files=specific_files)
640
649
 
641
650
    def set_make_working_trees(self, trees):
642
651
        raise errors.UnsupportedOperation(self.set_make_working_trees, self)
643
652
 
644
653
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
645
 
        progress=None, limit=None):
 
654
                      progress=None, limit=None):
646
655
        return self._git.fetch_objects(determine_wants, graph_walker, progress,
647
 
            limit=limit)
 
656
                                       limit=limit)
648
657
 
649
658
 
650
659
class GitRepositoryFormat(repository.RepositoryFormat):
699
708
    from ..bzr.groupcompress_repo import RepositoryFormat2a
700
709
    from . import interrepo
701
710
    return [
702
 
            (interrepo.InterLocalGitNonGitRepository, GitRepositoryFormat(), RepositoryFormat2a()),
703
 
            (interrepo.InterLocalGitLocalGitRepository, GitRepositoryFormat(), GitRepositoryFormat()),
704
 
            (interrepo.InterToLocalGitRepository, RepositoryFormat2a(), GitRepositoryFormat()),
 
711
        (interrepo.InterLocalGitNonGitRepository,
 
712
         GitRepositoryFormat(), RepositoryFormat2a()),
 
713
        (interrepo.InterLocalGitLocalGitRepository,
 
714
         GitRepositoryFormat(), GitRepositoryFormat()),
 
715
        (interrepo.InterToLocalGitRepository,
 
716
         RepositoryFormat2a(), GitRepositoryFormat()),
705
717
        ]