/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: 2020-07-20 02:17:05 UTC
  • mfrom: (7518.1.2 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200720021705-5f11tmo1hdqjxm6x
Merge lp:brz/3.1.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/dir.py
39
39
    RepositoryAcquisitionPolicy,
40
40
    )
41
41
 
 
42
from .mapping import (
 
43
    decode_git_path,
 
44
    encode_git_path,
 
45
    )
42
46
from .push import (
43
47
    GitPushResult,
44
48
    )
537
541
                    target_branch._format, self._format)
538
542
            # TODO(jelmer): Do some consistency checking across branches..
539
543
            self.control_transport.put_bytes(
540
 
                'commondir', target_path.encode('utf-8'))
 
544
                'commondir', encode_git_path(target_path))
541
545
            # TODO(jelmer): Urgh, avoid mucking about with internals.
542
546
            self._git._commontransport = (
543
547
                target_branch.repository._git._commontransport.clone())
577
581
                base_url = self.user_url.rstrip('/')
578
582
            else:
579
583
                base_url = urlutils.local_path_to_url(
580
 
                    commondir.decode(osutils._fs_enc)).rstrip('/.git/') + '/'
 
584
                    decode_git_path(commondir)).rstrip('/.git/') + '/'
581
585
            return urlutils.join_segment_parameters(base_url, params)
582
586
        return None
583
587