4
from bzrlib.selftest import TestCaseInTempDir, TestCase
4
from bzrlib.tests import TestCaseInTempDir, TestCase
5
5
from bzrlib.branch import ScratchBranch, Branch
6
from bzrlib.errors import NotBranchError, NotVersionedError
6
from bzrlib.errors import NotBranchError
9
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
11
def test_no_changes(self):
21
12
from bzrlib.errors import PointlessCommit
23
b = Branch.initialize('.')
14
b = Branch.initialize(u'.')
25
16
self.build_tree(['hello.txt'])
27
18
self.assertRaises(PointlessCommit,
19
b.working_tree().commit,
29
20
'commit without adding',
30
21
allow_pointless=False)
32
b.commit('commit pointless tree',
23
b.working_tree().commit('commit pointless tree',
33
24
allow_pointless=True)
26
b.working_tree().add('hello.txt')
37
b.commit('commit first added file',
28
b.working_tree().commit('commit first added file',
38
29
allow_pointless=False)
40
31
self.assertRaises(PointlessCommit,
32
b.working_tree().commit,
42
33
'commit after adding file',
43
34
allow_pointless=False)
45
b.commit('commit pointless revision with one file',
36
b.working_tree().commit('commit pointless revision with one file',
46
37
allow_pointless=True)
48
b.add_pending_merge('mbp@892739123-2005-123123')
49
b.commit('commit new merge with no text changes',
50
allow_pointless=False)
54
class TestRevisionId(TestCase):
56
def test_validate_revision_id(self):
57
from bzrlib.revision import validate_revision_id
58
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
59
self.assertRaises(ValueError,
62
self.assertRaises(ValueError,
64
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
65
self.assertRaises(ValueError,
67
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
68
self.assertRaises(ValueError,
70
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
73
class PendingMerges(TestCaseInTempDir):
75
def test_pending_merges(self):
76
"""Tracking pending-merged revisions."""
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(), [])
98
def test_revert(self):
99
"""Test selected-file revert"""
100
b = Branch.initialize('.')
102
self.build_tree(['hello.txt'])
103
file('hello.txt', 'w').write('initial hello')
105
self.assertRaises(NotVersionedError,
106
b.revert, ['hello.txt'])
109
b.commit('create initial hello.txt')
111
self.check_file_contents('hello.txt', 'initial hello')
112
file('hello.txt', 'w').write('new hello')
113
self.check_file_contents('hello.txt', 'new hello')
115
# revert file modified since last revision
116
b.revert(['hello.txt'])
117
self.check_file_contents('hello.txt', 'initial hello')
118
self.check_file_contents('hello.txt~', 'new hello')
120
# reverting again clobbers the backup
121
b.revert(['hello.txt'])
122
self.check_file_contents('hello.txt', 'initial hello')
123
self.check_file_contents('hello.txt~', 'initial hello')
40
class MoreTests(TestCaseInTempDir):
125
42
def test_rename_dirs(self):
126
43
"""Test renaming directories and the files within them."""
127
b = Branch.initialize('.')
44
b = Branch.initialize(u'.')
128
45
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
129
b.add(['dir', 'dir/sub', 'dir/sub/file'])
46
b.working_tree().add(['dir', 'dir/sub', 'dir/sub/file'])
131
b.commit('create initial state')
48
b.working_tree().commit('create initial state')
133
50
# TODO: lift out to a test helper that checks the shape of
142
59
self.check_inventory_shape(inv,
143
60
['dir', 'dir/sub', 'dir/sub/file'])
145
b.rename_one('dir', 'newdir')
62
b.working_tree().rename_one('dir', 'newdir')
147
self.check_inventory_shape(b.inventory,
64
self.check_inventory_shape(b.working_tree().read_working_inventory(),
148
65
['newdir', 'newdir/sub', 'newdir/sub/file'])
150
b.rename_one('newdir/sub', 'newdir/newsub')
151
self.check_inventory_shape(b.inventory,
67
b.working_tree().rename_one('newdir/sub', 'newdir/newsub')
68
self.check_inventory_shape(b.working_tree().read_working_inventory(),
152
69
['newdir', 'newdir/newsub',
153
70
'newdir/newsub/file'])
155
72
def test_relpath(self):
156
73
"""test for branch path lookups
158
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
75
bzrlib.osutils._relpath do a simple but subtle
159
76
job: given a path (either relative to cwd or absolute), work out
160
77
if it is inside a branch and return the path relative to the base.
162
from bzrlib.branch import _relpath
79
from bzrlib.osutils import relpath
163
80
import tempfile, shutil
165
82
savedir = os.getcwdu()
added
removed
bzrlib/tests/test_whitebox.py
