/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/dir.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/dir.py
89
89
            relative to.
90
90
        """
91
91
        super(UseExistingRepository, self).__init__(
92
 
                stack_on, stack_on_pwd, require_stacking)
 
92
            stack_on, stack_on_pwd, require_stacking)
93
93
        self._repository = repository
94
94
 
95
95
    def acquire_repository(self, make_working_trees=None, shared=False,
96
 
            possible_transports=None):
 
96
                           possible_transports=None):
97
97
        """Implementation of RepositoryAcquisitionPolicy.acquire_repository
98
98
 
99
99
        Returns an existing repository to use.
167
167
            result_repo = result.find_repository()
168
168
        except brz_errors.NoRepositoryPresent:
169
169
            result_repo = result.create_repository()
170
 
            target_is_empty = True
171
 
        else:
172
 
            target_is_empty = None # Unknown
173
170
        if stacked:
174
 
            raise _mod_branch.UnstackableBranchFormat(self._format, self.user_url)
 
171
            raise _mod_branch.UnstackableBranchFormat(
 
172
                self._format, self.user_url)
175
173
        interrepo = InterRepository.get(source_repository, result_repo)
176
174
 
177
175
        if revision_id is not None:
180
178
        else:
181
179
            determine_wants = interrepo.determine_wants_all
182
180
        interrepo.fetch_objects(determine_wants=determine_wants,
183
 
            mapping=source_branch.mapping)
184
 
        result_branch = source_branch.sprout(result,
185
 
            revision_id=revision_id, repository=result_repo)
186
 
        if (create_tree_if_local
187
 
            and isinstance(target_transport, LocalTransport)
188
 
            and (result_repo is None or result_repo.make_working_trees())):
189
 
            wt = result.create_workingtree(accelerator_tree=accelerator_tree,
 
181
                                mapping=source_branch.mapping)
 
182
        result_branch = source_branch.sprout(
 
183
            result, revision_id=revision_id, repository=result_repo)
 
184
        if (create_tree_if_local and
 
185
            isinstance(target_transport, LocalTransport) and
 
186
                (result_repo is None or result_repo.make_working_trees())):
 
187
            result.create_workingtree(
 
188
                accelerator_tree=accelerator_tree,
190
189
                hardlink=hardlink, from_branch=result_branch)
191
190
        return result
192
191
 
193
192
    def clone_on_transport(self, transport, revision_id=None,
194
 
        force_new_repo=False, preserve_stacking=False, stacked_on=None,
195
 
        create_prefix=False, use_existing_dir=True, no_tree=False):
 
193
                           force_new_repo=False, preserve_stacking=False,
 
194
                           stacked_on=None, create_prefix=False,
 
195
                           use_existing_dir=True, no_tree=False):
196
196
        """See ControlDir.clone_on_transport."""
197
197
        from ..repository import InterRepository
198
198
        from .mapping import default_mapping
199
199
        if stacked_on is not None:
200
 
            raise _mod_branch.UnstackableBranchFormat(self._format, self.user_url)
 
200
            raise _mod_branch.UnstackableBranchFormat(
 
201
                self._format, self.user_url)
201
202
        if no_tree:
202
203
            format = BareLocalGitControlDirFormat()
203
204
        else:
204
205
            format = LocalGitControlDirFormat()
205
206
        (target_repo, target_controldir, stacking,
206
 
                repo_policy) = format.initialize_on_transport_ex(
207
 
                        transport, use_existing_dir=use_existing_dir,
208
 
                        create_prefix=create_prefix,
209
 
                        force_new_repo=force_new_repo)
 
207
         repo_policy) = format.initialize_on_transport_ex(
 
208
            transport, use_existing_dir=use_existing_dir,
 
209
            create_prefix=create_prefix,
 
210
            force_new_repo=force_new_repo)
210
211
        target_repo = target_controldir.find_repository()
211
212
        target_git_repo = target_repo._git
212
213
        source_repo = self.find_repository()
213
 
        source_git_repo = source_repo._git
214
214
        interrepo = InterRepository.get(source_repo, target_repo)
215
215
        if revision_id is not None:
216
 
            determine_wants = interrepo.get_determine_wants_revids([revision_id], include_tags=True)
 
216
            determine_wants = interrepo.get_determine_wants_revids(
 
217
                [revision_id], include_tags=True)
217
218
        else:
218
219
            determine_wants = interrepo.determine_wants_all
219
220
        (pack_hint, _, refs) = interrepo.fetch_objects(determine_wants,
220
 
            mapping=default_mapping)
 
221
                                                       mapping=default_mapping)
221
222
        for name, val in viewitems(refs):
222
223
            target_git_repo.refs[name] = val
223
224
        result_dir = self.__class__(transport, target_git_repo, format)
228
229
            # the tree and fail.
229
230
            result_dir.root_transport.local_abspath('.')
230
231
            if result_dir.open_repository().make_working_trees():
231
 
                self.open_workingtree().clone(result_dir, revision_id=revision_id)
 
232
                self.open_workingtree().clone(
 
233
                    result_dir, revision_id=revision_id)
232
234
        except (brz_errors.NoWorkingTree, brz_errors.NotLocalUrl):
233
235
            pass
234
236
 
291
293
        push_result.master_branch = None
292
294
        push_result.source_branch = source
293
295
        push_result.stacked_on = None
294
 
        repo = self.find_repository()
295
 
        refname = self._get_selected_ref(name)
296
296
        from .branch import GitBranch
297
297
        if isinstance(source, GitBranch) and lossy:
298
298
            raise brz_errors.LossyPushToSameVCS(source.controldir, self)
299
299
        target = self.open_branch(name, nascent_ok=True)
300
300
        push_result.branch_push_result = source.push(
301
 
                target, overwrite=overwrite, stop_revision=revision_id,
302
 
                lossy=lossy)
 
301
            target, overwrite=overwrite, stop_revision=revision_id,
 
302
            lossy=lossy)
303
303
        push_result.new_revid = push_result.branch_push_result.new_revid
304
304
        push_result.old_revid = push_result.branch_push_result.old_revid
305
 
        push_result.target_branch = self.open_branch(name)
 
305
        push_result.target_branch = target
306
306
        if source.get_push_location() is None or remember:
307
307
            source.set_push_location(push_result.target_branch.base)
308
308
        return push_result
336
336
 
337
337
        """
338
338
        from .transportgit import TransportRepo
 
339
 
339
340
        def _open(transport):
340
341
            return TransportRepo(transport, self.bare,
341
 
                refs_text=getattr(self, "_refs_text", None))
 
342
                                 refs_text=getattr(self, "_refs_text", None))
 
343
 
342
344
        def redirected(transport, e, redirection_notice):
343
345
            trace.note(redirection_notice)
344
346
            return transport._redirected_to(e.source, e.target)
352
354
 
353
355
    def initialize_on_transport(self, transport):
354
356
        from .transportgit import TransportRepo
355
 
        repo = TransportRepo.init(transport, bare=self.bare)
356
 
        return self.open(transport)
 
357
        git_repo = TransportRepo.init(transport, bare=self.bare)
 
358
        return LocalGitDir(transport, git_repo, self)
357
359
 
358
360
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
359
 
        create_prefix=False, force_new_repo=False, stacked_on=None,
360
 
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
361
 
        shared_repo=False, vfs_only=False):
 
361
                                   create_prefix=False, force_new_repo=False,
 
362
                                   stacked_on=None,
 
363
                                   stack_on_pwd=None, repo_format_name=None,
 
364
                                   make_working_trees=None,
 
365
                                   shared_repo=False, vfs_only=False):
362
366
        def make_directory(transport):
363
367
            transport.mkdir('.')
364
368
            return transport
 
369
 
365
370
        def redirected(transport, e, redirection_notice):
366
371
            trace.note(redirection_notice)
367
372
            return transport._redirected_to(e.source, e.target)
368
373
        try:
369
 
            transport = do_catching_redirections(make_directory, transport,
370
 
                redirected)
 
374
            transport = do_catching_redirections(
 
375
                make_directory, transport, redirected)
371
376
        except brz_errors.FileExists:
372
377
            if not use_existing_dir:
373
378
                raise
439
444
        self._mode_check_done = None
440
445
 
441
446
    def is_control_filename(self, filename):
442
 
        return (filename == '.git' or
443
 
                filename.startswith('.git/') or
444
 
                filename.startswith('.git\\'))
 
447
        return (filename == '.git'
 
448
                or filename.startswith('.git/')
 
449
                or filename.startswith('.git\\'))
445
450
 
446
451
    def _get_symref(self, ref):
447
452
        ref_chain, unused_sha = self._git.refs.follow(ref)
451
456
 
452
457
    def set_branch_reference(self, target_branch, name=None):
453
458
        ref = self._get_selected_ref(name)
454
 
        if self.control_transport.base == target_branch.controldir.control_transport.base:
 
459
        target_transport = target_branch.controldir.control_transport
 
460
        if self.control_transport.base == target_transport.base:
455
461
            if ref == target_branch.ref:
456
462
                raise BranchReferenceLoop(target_branch)
457
463
            self._git.refs.set_symbolic_ref(ref, target_branch.ref)
458
464
        else:
459
465
            try:
460
 
                target_path = target_branch.controldir.control_transport.local_abspath('.')
 
466
                target_path = (
 
467
                    target_branch.controldir.control_transport.local_abspath(
 
468
                        '.'))
461
469
            except brz_errors.NotLocalUrl:
462
 
                raise brz_errors.IncompatibleFormat(target_branch._format, self._format)
 
470
                raise brz_errors.IncompatibleFormat(
 
471
                    target_branch._format, self._format)
463
472
            # TODO(jelmer): Do some consistency checking across branches..
464
 
            self.control_transport.put_bytes('commondir', target_path.encode('utf-8'))
 
473
            self.control_transport.put_bytes(
 
474
                'commondir', target_path.encode('utf-8'))
465
475
            # TODO(jelmer): Urgh, avoid mucking about with internals.
466
 
            self._git._commontransport = target_branch.repository._git._commontransport.clone()
467
 
            self._git.object_store = TransportObjectStore(self._git._commontransport.clone(OBJECTDIR))
 
476
            self._git._commontransport = (
 
477
                target_branch.repository._git._commontransport.clone())
 
478
            self._git.object_store = TransportObjectStore(
 
479
                self._git._commontransport.clone(OBJECTDIR))
468
480
            self._git.refs.transport = self._git._commontransport
469
 
            target_ref_chain, unused_sha = target_branch.controldir._git.refs.follow(target_branch.ref)
 
481
            target_ref_chain, unused_sha = (
 
482
                target_branch.controldir._git.refs.follow(target_branch.ref))
470
483
            for target_ref in target_ref_chain:
471
484
                if target_ref == b'HEAD':
472
485
                    continue
473
486
                break
474
487
            else:
475
488
                # Can't create a reference to something that is not a in a repository.
476
 
                raise brz_errors.IncompatibleFormat(self.set_branch_reference, self)
 
489
                raise brz_errors.IncompatibleFormat(
 
490
                    self.set_branch_reference, self)
477
491
            self._git.refs.set_symbolic_ref(ref, target_ref)
478
492
 
479
493
    def get_branch_reference(self, name=None):
484
498
            try:
485
499
                branch_name = ref_to_branch_name(target_ref)
486
500
            except ValueError:
487
 
                params = {'ref': urlutils.quote(target_ref.decode('utf-8'), '')}
 
501
                params = {'ref': urlutils.quote(
 
502
                    target_ref.decode('utf-8'), '')}
488
503
            else:
489
504
                if branch_name != '':
490
505
                    params = {'branch': urlutils.quote(branch_name, '')}
495
510
            except brz_errors.NoSuchFile:
496
511
                base_url = self.user_url.rstrip('/')
497
512
            else:
498
 
                base_url = urlutils.local_path_to_url(commondir.decode(osutils._fs_enc)).rstrip('/.git/')+'/'
 
513
                base_url = urlutils.local_path_to_url(
 
514
                    commondir.decode(osutils._fs_enc)).rstrip('/.git/') + '/'
499
515
            if not PY3:
500
516
                params = {k: v.encode('utf-8') for (k, v) in viewitems(params)}
501
517
            return urlutils.join_segment_parameters(base_url, params)
505
521
        from .branch import (
506
522
            LocalGitBranchFormat,
507
523
            )
508
 
        ref = self._get_selected_ref(name)
509
524
        return LocalGitBranchFormat()
510
525
 
511
526
    def get_branch_transport(self, branch_format, name=None):
530
545
        raise brz_errors.IncompatibleFormat(format, self._format)
531
546
 
532
547
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=None,
533
 
            ref=None, possible_transports=None, nascent_ok=False):
 
548
                    ref=None, possible_transports=None, nascent_ok=False):
534
549
        """'create' a branch for this dir."""
535
550
        repo = self.find_repository()
536
551
        from .branch import LocalGitBranch
537
552
        ref = self._get_selected_ref(name, ref)
538
553
        if not nascent_ok and ref not in self._git.refs:
539
 
            raise brz_errors.NotBranchError(self.root_transport.base,
540
 
                    controldir=self)
 
554
            raise brz_errors.NotBranchError(
 
555
                self.root_transport.base, controldir=self)
541
556
        ref_chain, unused_sha = self._git.refs.follow(ref)
542
557
        if ref_chain[-1] == b'HEAD':
543
558
            controldir = self
554
569
        try:
555
570
            del self._git.refs[refname]
556
571
        except KeyError:
557
 
            raise brz_errors.NotBranchError(self.root_transport.base,
558
 
                    controldir=self)
 
572
            raise brz_errors.NotBranchError(
 
573
                self.root_transport.base, controldir=self)
559
574
 
560
575
    def destroy_repository(self):
561
576
        raise brz_errors.UnsupportedOperation(self.destroy_repository, self)
564
579
        raise brz_errors.UnsupportedOperation(self.destroy_workingtree, self)
565
580
 
566
581
    def destroy_workingtree_metadata(self):
567
 
        raise brz_errors.UnsupportedOperation(self.destroy_workingtree_metadata, self)
 
582
        raise brz_errors.UnsupportedOperation(
 
583
            self.destroy_workingtree_metadata, self)
568
584
 
569
585
    def needs_format_conversion(self, format=None):
570
586
        return not isinstance(self._format, format.__class__)
590
606
    def create_repository(self, shared=False):
591
607
        from .repository import GitRepositoryFormat
592
608
        if shared:
593
 
            raise brz_errors.IncompatibleFormat(GitRepositoryFormat(), self._format)
 
609
            raise brz_errors.IncompatibleFormat(
 
610
                GitRepositoryFormat(), self._format)
594
611
        return self.find_repository()
595
612
 
596
613
    def create_branch(self, name=None, repository=None,
600
617
            raise brz_errors.AlreadyBranchError(self.user_url)
601
618
        repo = self.open_repository()
602
619
        if refname in self._git.refs:
603
 
            ref_chain, unused_sha = self._git.refs.follow(self._get_selected_ref(None))
 
620
            ref_chain, unused_sha = self._git.refs.follow(
 
621
                self._get_selected_ref(None))
604
622
            if ref_chain[0] == b'HEAD':
605
623
                refname = ref_chain[1]
606
624
        from .branch import LocalGitBranch
620
638
            parent.copy_tree(basename, basename + ".backup")
621
639
 
622
640
    def create_workingtree(self, revision_id=None, from_branch=None,
623
 
        accelerator_tree=None, hardlink=False):
 
641
                           accelerator_tree=None, hardlink=False):
624
642
        if self._git.bare:
625
 
            raise brz_errors.UnsupportedOperation(self.create_workingtree, self)
 
643
            raise brz_errors.UnsupportedOperation(
 
644
                self.create_workingtree, self)
626
645
        if from_branch is None:
627
646
            from_branch = self.open_branch(nascent_ok=True)
628
647
        if revision_id is None:
694
713
            return self
695
714
        else:
696
715
            commondir = commondir.rstrip(b'/.git/').decode(osutils._fs_enc)
697
 
            return ControlDir.open_from_transport(get_transport_from_path(commondir))
 
716
            return ControlDir.open_from_transport(
 
717
                get_transport_from_path(commondir))