1
# Copyright (C) 2005, 2006 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
23
from bzrlib.tests import TestCaseWithTransport, TestCase
24
from bzrlib.branch import Branch
25
from bzrlib.errors import PathNotChild
26
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
29
class MoreTests(TestCaseWithTransport):
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
5
from bzrlib.branch import ScratchBranch, Branch
6
from bzrlib.errors import NotBranchError, NotVersionedError
9
class TestBranch(TestCaseInTempDir):
11
def test_unknowns(self):
12
b = Branch.initialize('.')
14
self.build_tree(['hello.txt',
17
self.assertEquals(list(b.unknowns()),
20
def test_no_changes(self):
21
from bzrlib.errors import PointlessCommit
23
b = Branch.initialize('.')
25
self.build_tree(['hello.txt'])
27
self.assertRaises(PointlessCommit,
29
'commit without adding',
30
allow_pointless=False)
32
b.commit('commit pointless tree',
37
b.commit('commit first added file',
38
allow_pointless=False)
40
self.assertRaises(PointlessCommit,
42
'commit after adding file',
43
allow_pointless=False)
45
b.commit('commit pointless revision with one file',
51
class TestRevisionId(TestCase):
53
def test_validate_revision_id(self):
54
from bzrlib.revision import validate_revision_id
55
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
56
self.assertRaises(ValueError,
59
self.assertRaises(ValueError,
61
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
62
self.assertRaises(ValueError,
64
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
65
self.assertRaises(ValueError,
67
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
70
class PendingMerges(TestCaseInTempDir):
72
def test_pending_merges(self):
73
"""Tracking pending-merged revisions."""
74
print "GHOST SUPPORT REMOVED"
77
b = Branch.initialize('.')
79
self.assertEquals(b.pending_merges(), [])
80
b.add_pending_merge('foo@azkhazan-123123-abcabc')
81
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
82
b.add_pending_merge('foo@azkhazan-123123-abcabc')
83
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
84
b.add_pending_merge('wibble@fofof--20050401--1928390812')
85
self.assertEquals(b.pending_merges(),
86
['foo@azkhazan-123123-abcabc',
87
'wibble@fofof--20050401--1928390812'])
88
b.commit("commit from base with two merges")
89
rev = b.get_revision(b.revision_history()[0])
90
self.assertEquals(len(rev.parents), 2)
91
self.assertEquals(rev.parents[0].revision_id,
92
'foo@azkhazan-123123-abcabc')
93
self.assertEquals(rev.parents[1].revision_id,
94
'wibble@fofof--20050401--1928390812')
95
# list should be cleared when we do a commit
96
self.assertEquals(b.pending_merges(), [])
99
class MoreTests(TestCaseInTempDir):
101
def test_revert(self):
102
"""Test selected-file revert"""
103
b = Branch.initialize('.')
105
self.build_tree(['hello.txt'])
106
file('hello.txt', 'w').write('initial hello')
108
self.assertRaises(NotVersionedError,
109
b.revert, ['hello.txt'])
112
b.commit('create initial hello.txt')
114
self.check_file_contents('hello.txt', 'initial hello')
115
file('hello.txt', 'w').write('new hello')
116
self.check_file_contents('hello.txt', 'new hello')
118
# revert file modified since last revision
119
b.revert(['hello.txt'])
120
self.check_file_contents('hello.txt', 'initial hello')
121
self.check_file_contents('hello.txt~', 'new hello')
123
# reverting again clobbers the backup
124
b.revert(['hello.txt'])
125
self.check_file_contents('hello.txt', 'initial hello')
126
self.check_file_contents('hello.txt~', 'initial hello')
128
def test_rename_dirs(self):
129
"""Test renaming directories and the files within them."""
130
b = Branch.initialize('.')
131
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
132
b.add(['dir', 'dir/sub', 'dir/sub/file'])
134
b.commit('create initial state')
136
# TODO: lift out to a test helper that checks the shape of
139
revid = b.revision_history()[0]
140
self.log('first revision_id is {%s}' % revid)
142
inv = b.get_revision_inventory(revid)
143
self.log('contents of inventory: %r' % inv.entries())
145
self.check_inventory_shape(inv,
146
['dir', 'dir/sub', 'dir/sub/file'])
148
b.rename_one('dir', 'newdir')
150
self.check_inventory_shape(b.inventory,
151
['newdir', 'newdir/sub', 'newdir/sub/file'])
153
b.rename_one('newdir/sub', 'newdir/newsub')
154
self.check_inventory_shape(b.inventory,
155
['newdir', 'newdir/newsub',
156
'newdir/newsub/file'])
31
158
def test_relpath(self):
32
159
"""test for branch path lookups
34
bzrlib.osutils._relpath do a simple but subtle
161
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
35
162
job: given a path (either relative to cwd or absolute), work out
36
163
if it is inside a branch and return the path relative to the base.
165
from bzrlib.branch import _relpath
166
import tempfile, shutil
40
168
savedir = os.getcwdu()
41
169
dtmp = tempfile.mkdtemp()
42
170
# On Mac OSX, /tmp actually expands to /private/tmp
171
dtmp = os.path.realpath(dtmp)
46
return relpath(dtmp, p)
174
return _relpath(dtmp, p)
49
177
# check paths inside dtmp while standing outside it
50
self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
178
self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
53
181
self.assertEqual(rp(dtmp), '')
55
self.assertRaises(PathNotChild,
183
self.assertRaises(NotBranchError,
59
187
# now some near-miss operations -- note that
60
188
# os.path.commonprefix gets these wrong!
61
self.assertRaises(PathNotChild,
189
self.assertRaises(NotBranchError,
63
191
dtmp.rstrip('\\/') + '2')
65
self.assertRaises(PathNotChild,
193
self.assertRaises(NotBranchError,
67
195
dtmp.rstrip('\\/') + '2/foo')
added
removed
bzrlib/selftest/whitebox.py
