4
from bzrlib.tests import TestCaseInTempDir, TestCase
6
from bzrlib.selftest import TestCaseInTempDir, TestCase
5
7
from bzrlib.branch import ScratchBranch, Branch
6
from bzrlib.errors import PathNotChild
8
from bzrlib.errors import NotBranchError, NotVersionedError
9
11
class TestBranch(TestCaseInTempDir):
13
def test_unknowns(self):
14
b = Branch.initialize('.')
16
self.build_tree(['hello.txt',
19
self.assertEquals(list(b.unknowns()),
11
22
def test_no_changes(self):
12
23
from bzrlib.errors import PointlessCommit
14
b = Branch.initialize(u'.')
25
b = Branch.initialize('.')
16
27
self.build_tree(['hello.txt'])
18
29
self.assertRaises(PointlessCommit,
19
b.working_tree().commit,
20
31
'commit without adding',
21
32
allow_pointless=False)
23
b.working_tree().commit('commit pointless tree',
34
b.commit('commit pointless tree',
24
35
allow_pointless=True)
26
b.working_tree().add('hello.txt')
28
b.working_tree().commit('commit first added file',
39
b.commit('commit first added file',
29
40
allow_pointless=False)
31
42
self.assertRaises(PointlessCommit,
32
b.working_tree().commit,
33
44
'commit after adding file',
34
45
allow_pointless=False)
36
b.working_tree().commit('commit pointless revision with one file',
47
b.commit('commit pointless revision with one file',
37
48
allow_pointless=True)
40
class MoreTests(TestCaseInTempDir):
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(TestCaseInTempDir):
77
def test_pending_merges(self):
78
"""Tracking pending-merged revisions."""
79
b = Branch.initialize('.')
81
self.assertEquals(b.pending_merges(), [])
82
b.add_pending_merge('foo@azkhazan-123123-abcabc')
83
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
84
b.add_pending_merge('foo@azkhazan-123123-abcabc')
85
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
86
b.add_pending_merge('wibble@fofof--20050401--1928390812')
87
self.assertEquals(b.pending_merges(),
88
['foo@azkhazan-123123-abcabc',
89
'wibble@fofof--20050401--1928390812'])
90
b.commit("commit from base with two merges")
91
rev = b.get_revision(b.revision_history()[0])
92
self.assertEquals(len(rev.parents), 2)
93
self.assertEquals(rev.parents[0].revision_id,
94
'foo@azkhazan-123123-abcabc')
95
self.assertEquals(rev.parents[1].revision_id,
96
'wibble@fofof--20050401--1928390812')
97
# list should be cleared when we do a commit
98
self.assertEquals(b.pending_merges(), [])
100
def test_revert(self):
101
"""Test selected-file revert"""
102
b = Branch.initialize('.')
104
self.build_tree(['hello.txt'])
105
file('hello.txt', 'w').write('initial hello')
107
self.assertRaises(NotVersionedError,
108
b.revert, ['hello.txt'])
111
b.commit('create initial hello.txt')
113
self.check_file_contents('hello.txt', 'initial hello')
114
file('hello.txt', 'w').write('new hello')
115
self.check_file_contents('hello.txt', 'new hello')
117
# revert file modified since last revision
118
b.revert(['hello.txt'])
119
self.check_file_contents('hello.txt', 'initial hello')
120
self.check_file_contents('hello.txt~', 'new hello')
122
# reverting again clobbers the backup
123
b.revert(['hello.txt'])
124
self.check_file_contents('hello.txt', 'initial hello')
125
self.check_file_contents('hello.txt~', 'initial hello')
42
127
def test_rename_dirs(self):
43
128
"""Test renaming directories and the files within them."""
44
b = Branch.initialize(u'.')
129
b = Branch.initialize('.')
45
130
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
46
b.working_tree().add(['dir', 'dir/sub', 'dir/sub/file'])
131
b.add(['dir', 'dir/sub', 'dir/sub/file'])
48
b.working_tree().commit('create initial state')
133
b.commit('create initial state')
50
135
# TODO: lift out to a test helper that checks the shape of
59
144
self.check_inventory_shape(inv,
60
145
['dir', 'dir/sub', 'dir/sub/file'])
62
b.working_tree().rename_one('dir', 'newdir')
147
b.rename_one('dir', 'newdir')
64
self.check_inventory_shape(b.working_tree().read_working_inventory(),
149
self.check_inventory_shape(b.inventory,
65
150
['newdir', 'newdir/sub', 'newdir/sub/file'])
67
b.working_tree().rename_one('newdir/sub', 'newdir/newsub')
68
self.check_inventory_shape(b.working_tree().read_working_inventory(),
152
b.rename_one('newdir/sub', 'newdir/newsub')
153
self.check_inventory_shape(b.inventory,
69
154
['newdir', 'newdir/newsub',
70
155
'newdir/newsub/file'])
72
157
def test_relpath(self):
73
158
"""test for branch path lookups
75
bzrlib.osutils._relpath do a simple but subtle
160
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
76
161
job: given a path (either relative to cwd or absolute), work out
77
162
if it is inside a branch and return the path relative to the base.
79
from bzrlib.osutils import relpath
164
from bzrlib.branch import _relpath
80
165
import tempfile, shutil
82
167
savedir = os.getcwdu()
added
removed
bzrlib/selftest/whitebox.py
