~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/treeshape.py

  • Committer: Robert Collins
  • Date: 2005-10-06 22:15:52 UTC
  • mfrom: (1185.13.2)
  • mto: This revision was merged to the branch mainline in revision 1420.
  • Revision ID: robertc@robertcollins.net-20051006221552-9b15c96fa504e0ad
mergeĀ fromĀ upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
# Copyright (C) 2005 by 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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
31
31
import stat
32
32
 
33
33
from bzrlib.trace import warning
34
 
from bzrlib.osutils import pathjoin
35
34
 
36
35
def build_tree_contents(template):
37
36
    """Reconstitute some files from a text description.
64
63
        yield (dirpath + '/', )
65
64
        filenames.sort()
66
65
        for fn in filenames:
67
 
            fullpath = pathjoin(dirpath, fn)
68
 
            assert not (fullpath[-1] in '@/')
 
66
            fullpath = os.path.join(dirpath, fn)
 
67
            assert fullpath[-1] not in '@/'
69
68
            info = os.lstat(fullpath)
70
69
            if stat.S_ISLNK(info.st_mode):
71
70
                yield (fullpath + '@', os.readlink(fullpath))