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):
31
def test_relpath(self):
32
"""test for branch path lookups
6
from bzrlib.selftest import InTempDir, TestBase
7
from bzrlib.branch import ScratchBranch, Branch
8
from bzrlib.errors import NotBranchError, NotVersionedError
11
class Unknowns(InTempDir):
13
b = Branch('.', init=True)
15
self.build_tree(['hello.txt',
18
self.assertEquals(list(b.unknowns()),
23
class ValidateRevisionId(TestBase):
25
from bzrlib.revision import validate_revision_id
26
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
28
self.assertRaises(ValueError,
33
self.assertRaises(ValueError,
35
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
38
self.assertRaises(ValueError,
40
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
42
self.assertRaises(ValueError,
44
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
48
class PendingMerges(InTempDir):
49
"""Tracking pending-merged revisions."""
51
b = Branch('.', init=True)
53
self.assertEquals(b.pending_merges(), [])
55
b.add_pending_merge('foo@azkhazan-123123-abcabc')
57
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
34
bzrlib.osutils._relpath do a simple but subtle
35
job: given a path (either relative to cwd or absolute), work out
36
if it is inside a branch and return the path relative to the base.
59
b.add_pending_merge('foo@azkhazan-123123-abcabc')
61
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
63
b.add_pending_merge('wibble@fofof--20050401--1928390812')
64
self.assertEquals(b.pending_merges(),
65
['foo@azkhazan-123123-abcabc',
66
'wibble@fofof--20050401--1928390812'])
68
b.commit("commit from base with two merges")
70
rev = b.get_revision(b.revision_history()[0])
71
self.assertEquals(len(rev.parents), 2)
72
self.assertEquals(rev.parents[0].revision_id,
73
'foo@azkhazan-123123-abcabc')
74
self.assertEquals(rev.parents[1].revision_id,
75
'wibble@fofof--20050401--1928390812')
77
# list should be cleared when we do a commit
78
self.assertEquals(b.pending_merges(), [])
83
class Revert(InTempDir):
84
"""Test selected-file revert"""
86
b = Branch('.', init=True)
88
self.build_tree(['hello.txt'])
89
file('hello.txt', 'w').write('initial hello')
91
self.assertRaises(NotVersionedError,
92
b.revert, ['hello.txt'])
95
b.commit('create initial hello.txt')
97
self.check_file_contents('hello.txt', 'initial hello')
98
file('hello.txt', 'w').write('new hello')
99
self.check_file_contents('hello.txt', 'new hello')
101
# revert file modified since last revision
102
b.revert(['hello.txt'])
103
self.check_file_contents('hello.txt', 'initial hello')
104
self.check_file_contents('hello.txt~', 'new hello')
106
# reverting again clobbers the backup
107
b.revert(['hello.txt'])
108
self.check_file_contents('hello.txt', 'initial hello')
109
self.check_file_contents('hello.txt~', 'initial hello')
113
class RenameDirs(InTempDir):
114
"""Test renaming directories and the files within them."""
116
b = Branch('.', init=True)
117
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
118
b.add(['dir', 'dir/sub', 'dir/sub/file'])
120
b.commit('create initial state')
122
# TODO: lift out to a test helper that checks the shape of
125
revid = b.revision_history()[0]
126
self.log('first revision_id is {%s}' % revid)
128
inv = b.get_revision_inventory(revid)
129
self.log('contents of inventory: %r' % inv.entries())
131
self.check_inventory_shape(inv,
132
['dir', 'dir/sub', 'dir/sub/file'])
134
b.rename_one('dir', 'newdir')
136
self.check_inventory_shape(b.inventory,
137
['newdir', 'newdir/sub', 'newdir/sub/file'])
139
b.rename_one('newdir/sub', 'newdir/newsub')
140
self.check_inventory_shape(b.inventory,
141
['newdir', 'newdir/newsub',
142
'newdir/newsub/file'])
147
class BranchPathTestCase(TestBase):
148
"""test for branch path lookups
150
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
151
job: given a path (either relative to cwd or absolute), work out
152
if it is inside a branch and return the path relative to the base.
156
from bzrlib.branch import _relpath
157
import tempfile, shutil
40
159
savedir = os.getcwdu()
41
160
dtmp = tempfile.mkdtemp()
42
# On Mac OSX, /tmp actually expands to /private/tmp
46
return relpath(dtmp, p)
163
return _relpath(dtmp, p)
49
166
# check paths inside dtmp while standing outside it
50
self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
167
self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
53
170
self.assertEqual(rp(dtmp), '')
55
self.assertRaises(PathNotChild,
172
self.assertRaises(NotBranchError,
59
176
# now some near-miss operations -- note that
60
177
# os.path.commonprefix gets these wrong!
61
self.assertRaises(PathNotChild,
178
self.assertRaises(NotBranchError,
63
180
dtmp.rstrip('\\/') + '2')
65
self.assertRaises(PathNotChild,
182
self.assertRaises(NotBranchError,
67
184
dtmp.rstrip('\\/') + '2/foo')
added
removed
bzrlib/selftest/whitebox.py
