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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-11 12:46:45 UTC
  • mfrom: (7511.1.1 actions-no-fork)
  • Revision ID: breezy.the.bot@gmail.com-20200611124645-4lx66gps99i0hmzh
Avoid using fork when running the testsuite in github actions.

Merged from https://code.launchpad.net/~jelmer/brz/actions-no-fork/+merge/385565

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/memorytree.py
39
39
    )
40
40
from breezy.transport.memory import MemoryTransport
41
41
 
42
 
from .mapping import (
43
 
    decode_git_path,
44
 
    encode_git_path,
45
 
    )
46
42
from .tree import MutableGitIndexTree
47
43
 
48
44
 
98
94
        while trees:
99
95
            (path, tree) = trees.pop()
100
96
            for name, mode, sha in tree.iteritems():
101
 
                subpath = posixpath.join(path, decode_git_path(name))
 
97
                subpath = posixpath.join(path, name.decode('utf-8'))
102
98
                if stat.S_ISDIR(mode):
103
99
                    self._file_transport.mkdir(subpath)
104
100
                    trees.append((subpath, self.store[sha]))
185
181
            return None
186
182
        elif stat.S_ISLNK(stat_val.st_mode):
187
183
            blob = Blob.from_string(
188
 
                encode_git_path(self._file_transport.readlink(path)))
 
184
                self._file_transport.readlink(path).encode('utf-8'))
189
185
        elif stat.S_ISREG(stat_val.st_mode):
190
186
            blob = Blob.from_string(self._file_transport.get_bytes(path))
191
187
        else: