/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/tests/treeshape.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-09 23:53:11 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180509235311-k1zk8mwcb09b8vm0
Update TODO.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/treeshape.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
30
30
import os
31
31
import stat
32
32
 
33
 
from bzrlib.trace import warning
34
 
from bzrlib.osutils import pathjoin
 
33
from ..trace import warning
 
34
from ..osutils import pathjoin
35
35
 
36
36
def build_tree_contents(template):
37
37
    """Reconstitute some files from a text description.
51
51
        if name[-1] == '/':
52
52
            os.mkdir(name)
53
53
        elif name[-1] == '@':
54
 
            raise NotImplementedError('symlinks not handled yet')
 
54
            os.symlink(tt[1], tt[0][:-1])
55
55
        else:
56
 
            f = file(name, 'wb')
57
 
            try:
 
56
            with open(name, 'wb') as f:
58
57
                f.write(tt[1])
59
 
            finally:
60
 
                f.close()
61
58
 
62
59
 
63
60
def capture_tree_contents(top):
75
72
            if stat.S_ISLNK(info.st_mode):
76
73
                yield (fullpath + '@', os.readlink(fullpath))
77
74
            elif stat.S_ISREG(info.st_mode):
78
 
                yield (fullpath, file(fullpath, 'rb').read())
 
75
                with open(fullpath, 'rb') as f:
 
76
                    file_bytes = f.read()
 
77
                yield (fullpath, file_bytes)
79
78
            else:
80
79
                warning("can't capture file %s with mode %#o",
81
80
                        fullpath, info.st_mode)