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

  • Committer: Gordon Tyler
  • Date: 2011-01-20 04:44:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: gordon@doxxx.net-20110120044414-x8vislng3ukcfr1d
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/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
41
41
 
42
42
    The template is built relative to the Python process's current
43
43
    working directory.
 
44
 
 
45
    ('foo/',) will build a directory.
 
46
    ('foo', 'bar') will write 'bar' to 'foo'
 
47
    ('foo@', 'linktarget') will raise an error
44
48
    """
45
49
    for tt in template:
46
50
        name = tt[0]
47
51
        if name[-1] == '/':
48
52
            os.mkdir(name)
49
53
        elif name[-1] == '@':
50
 
            raise NotImplementedError('symlinks not handled yet')
 
54
            os.symlink(tt[1], tt[0][:-1])
51
55
        else:
52
56
            f = file(name, 'wb')
53
57
            try: