4
from bzrlib.tests import TestCaseWithTransport, TestCase
6
from bzrlib.selftest import InTempDir, TestCase
5
7
from bzrlib.branch import ScratchBranch, Branch
6
from bzrlib.errors import PathNotChild
7
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
10
class MoreTests(TestCaseWithTransport):
8
from bzrlib.errors import NotBranchError, NotVersionedError
11
class TestBranch(InTempDir):
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)
27
self.build_tree(['hello.txt'])
29
self.assertRaises(PointlessCommit,
31
'commit without adding',
32
allow_pointless=False)
34
b.commit('commit pointless tree',
39
b.commit('commit first added file',
40
allow_pointless=False)
42
self.assertRaises(PointlessCommit,
44
'commit after adding file',
45
allow_pointless=False)
47
b.commit('commit pointless revision with one file',
50
b.add_pending_merge('mbp@892739123-2005-123123')
51
b.commit('commit new merge with no text changes',
52
allow_pointless=False)
56
class TestRevisionId(TestCase):
58
def test_validate_revision_id(self):
59
from bzrlib.revision import validate_revision_id
60
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
61
self.assertRaises(ValueError,
64
self.assertRaises(ValueError,
66
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
67
self.assertRaises(ValueError,
69
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
70
self.assertRaises(ValueError,
72
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
75
class PendingMerges(InTempDir):
76
def test_pending_merges(self):
77
"""Tracking pending-merged revisions."""
78
b = Branch('.', init=True)
80
self.assertEquals(b.pending_merges(), [])
82
b.add_pending_merge('foo@azkhazan-123123-abcabc')
84
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
86
b.add_pending_merge('foo@azkhazan-123123-abcabc')
88
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
90
b.add_pending_merge('wibble@fofof--20050401--1928390812')
91
self.assertEquals(b.pending_merges(),
92
['foo@azkhazan-123123-abcabc',
93
'wibble@fofof--20050401--1928390812'])
95
b.commit("commit from base with two merges")
97
rev = b.get_revision(b.revision_history()[0])
98
self.assertEquals(len(rev.parents), 2)
99
self.assertEquals(rev.parents[0].revision_id,
100
'foo@azkhazan-123123-abcabc')
101
self.assertEquals(rev.parents[1].revision_id,
102
'wibble@fofof--20050401--1928390812')
104
# list should be cleared when we do a commit
105
self.assertEquals(b.pending_merges(), [])
107
def test_revert(self):
108
"""Test selected-file revert"""
109
b = Branch('.', init=True)
111
self.build_tree(['hello.txt'])
112
file('hello.txt', 'w').write('initial hello')
114
self.assertRaises(NotVersionedError,
115
b.revert, ['hello.txt'])
118
b.commit('create initial hello.txt')
120
self.check_file_contents('hello.txt', 'initial hello')
121
file('hello.txt', 'w').write('new hello')
122
self.check_file_contents('hello.txt', 'new hello')
124
# revert file modified since last revision
125
b.revert(['hello.txt'])
126
self.check_file_contents('hello.txt', 'initial hello')
127
self.check_file_contents('hello.txt~', 'new hello')
129
# reverting again clobbers the backup
130
b.revert(['hello.txt'])
131
self.check_file_contents('hello.txt', 'initial hello')
132
self.check_file_contents('hello.txt~', 'initial hello')
134
def test_rename_dirs(self):
135
"""Test renaming directories and the files within them."""
136
b = Branch('.', init=True)
137
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
138
b.add(['dir', 'dir/sub', 'dir/sub/file'])
140
b.commit('create initial state')
142
# TODO: lift out to a test helper that checks the shape of
145
revid = b.revision_history()[0]
146
self.log('first revision_id is {%s}' % revid)
148
inv = b.get_revision_inventory(revid)
149
self.log('contents of inventory: %r' % inv.entries())
151
self.check_inventory_shape(inv,
152
['dir', 'dir/sub', 'dir/sub/file'])
154
b.rename_one('dir', 'newdir')
156
self.check_inventory_shape(b.inventory,
157
['newdir', 'newdir/sub', 'newdir/sub/file'])
159
b.rename_one('newdir/sub', 'newdir/newsub')
160
self.check_inventory_shape(b.inventory,
161
['newdir', 'newdir/newsub',
162
'newdir/newsub/file'])
12
164
def test_relpath(self):
13
165
"""test for branch path lookups
15
bzrlib.osutils._relpath do a simple but subtle
167
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
16
168
job: given a path (either relative to cwd or absolute), work out
17
169
if it is inside a branch and return the path relative to the base.
171
from bzrlib.branch import _relpath
19
172
import tempfile, shutil
21
174
savedir = os.getcwdu()
22
175
dtmp = tempfile.mkdtemp()
23
176
# On Mac OSX, /tmp actually expands to /private/tmp
177
dtmp = os.path.realpath(dtmp)
27
return relpath(dtmp, p)
180
return _relpath(dtmp, p)
30
183
# check paths inside dtmp while standing outside it
31
self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
184
self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
34
187
self.assertEqual(rp(dtmp), '')
36
self.assertRaises(PathNotChild,
189
self.assertRaises(NotBranchError,
40
193
# now some near-miss operations -- note that
41
194
# os.path.commonprefix gets these wrong!
42
self.assertRaises(PathNotChild,
195
self.assertRaises(NotBranchError,
44
197
dtmp.rstrip('\\/') + '2')
46
self.assertRaises(PathNotChild,
199
self.assertRaises(NotBranchError,
48
201
dtmp.rstrip('\\/') + '2/foo')
added
removed
bzrlib/selftest/whitebox.py
