/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: Jelmer Vernooij
  • Date: 2018-11-11 04:08:32 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181111040832-nsljjynzzwmznf3h
Run autopep8.

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