1
# Copyright (C) 2005, 2006 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20
from bzrlib.tests import TestCaseWithTransport, TestCase
21
from bzrlib.branch import Branch
22
from bzrlib.errors import PathNotChild
23
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
26
class MoreTests(TestCaseWithTransport):
6
from bzrlib.selftest import TestCaseInTempDir, TestCase
7
from bzrlib.branch import ScratchBranch, Branch
8
from bzrlib.errors import NotBranchError, NotVersionedError
11
class TestBranch(TestCaseInTempDir):
13
def test_unknowns(self):
14
b = Branch('.', init=True)
16
self.build_tree(['hello.txt',
19
self.assertEquals(list(b.unknowns()),
22
def test_no_changes(self):
23
from bzrlib.errors import PointlessCommit
25
b = Branch('.', init=True)
26
self.build_tree(['hello.txt'])
28
self.assertRaises(PointlessCommit,
30
'commit without adding',
31
allow_pointless=False)
33
b.commit('commit pointless tree',
38
b.commit('commit first added file',
39
allow_pointless=False)
41
self.assertRaises(PointlessCommit,
43
'commit after adding file',
44
allow_pointless=False)
46
b.commit('commit pointless revision with one file',
52
class TestRevisionId(TestCase):
54
def test_validate_revision_id(self):
55
from bzrlib.revision import validate_revision_id
56
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
57
self.assertRaises(ValueError,
60
self.assertRaises(ValueError,
62
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
63
self.assertRaises(ValueError,
65
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
66
self.assertRaises(ValueError,
68
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
71
class MoreTests(TestCaseInTempDir):
72
def test_revert(self):
73
"""Test selected-file revert"""
74
b = Branch('.', init=True)
76
self.build_tree(['hello.txt'])
77
file('hello.txt', 'w').write('initial hello')
79
self.assertRaises(NotVersionedError,
80
b.revert, ['hello.txt'])
83
b.commit('create initial hello.txt')
85
self.check_file_contents('hello.txt', 'initial hello')
86
file('hello.txt', 'w').write('new hello')
87
self.check_file_contents('hello.txt', 'new hello')
89
# revert file modified since last revision
90
b.revert(['hello.txt'])
91
self.check_file_contents('hello.txt', 'initial hello')
92
self.check_file_contents('hello.txt~', 'new hello')
94
# reverting again clobbers the backup
95
b.revert(['hello.txt'])
96
self.check_file_contents('hello.txt', 'initial hello')
97
self.check_file_contents('hello.txt~', 'initial hello')
99
def test_rename_dirs(self):
100
"""Test renaming directories and the files within them."""
101
b = Branch('.', init=True)
102
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
103
b.add(['dir', 'dir/sub', 'dir/sub/file'])
105
b.commit('create initial state')
107
# TODO: lift out to a test helper that checks the shape of
110
revid = b.revision_history()[0]
111
self.log('first revision_id is {%s}' % revid)
113
inv = b.get_revision_inventory(revid)
114
self.log('contents of inventory: %r' % inv.entries())
116
self.check_inventory_shape(inv,
117
['dir', 'dir/sub', 'dir/sub/file'])
119
b.rename_one('dir', 'newdir')
121
self.check_inventory_shape(b.inventory,
122
['newdir', 'newdir/sub', 'newdir/sub/file'])
124
b.rename_one('newdir/sub', 'newdir/newsub')
125
self.check_inventory_shape(b.inventory,
126
['newdir', 'newdir/newsub',
127
'newdir/newsub/file'])
28
129
def test_relpath(self):
29
130
"""test for branch path lookups
31
bzrlib.osutils._relpath do a simple but subtle
132
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
32
133
job: given a path (either relative to cwd or absolute), work out
33
134
if it is inside a branch and return the path relative to the base.
36
from bzrlib.osutils import rmtree
136
from bzrlib.branch import _relpath
137
import tempfile, shutil
38
139
savedir = os.getcwdu()
39
140
dtmp = tempfile.mkdtemp()
40
141
# On Mac OSX, /tmp actually expands to /private/tmp
142
dtmp = os.path.realpath(dtmp)
44
return relpath(dtmp, p)
145
return _relpath(dtmp, p)
47
148
# check paths inside dtmp while standing outside it
48
self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
149
self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
51
152
self.assertEqual(rp(dtmp), '')
53
self.assertRaises(PathNotChild,
154
self.assertRaises(NotBranchError,
57
158
# now some near-miss operations -- note that
58
159
# os.path.commonprefix gets these wrong!
59
self.assertRaises(PathNotChild,
160
self.assertRaises(NotBranchError,
61
162
dtmp.rstrip('\\/') + '2')
63
self.assertRaises(PathNotChild,
164
self.assertRaises(NotBranchError,
65
166
dtmp.rstrip('\\/') + '2/foo')
added
removed
bzrlib/selftest/whitebox.py
