6
from bzrlib.selftest import InTempDir, TestCase
4
from bzrlib.tests import TestCaseInTempDir, TestCase
7
5
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 NoChanges(InTempDir):
6
from bzrlib.errors import NotBranchError
7
from bzrlib.osutils import pathjoin
10
class TestBranch(TestCaseInTempDir):
12
def test_no_changes(self):
25
13
from bzrlib.errors import PointlessCommit
27
b = Branch('.', init=True)
15
b = Branch.initialize(u'.')
29
17
self.build_tree(['hello.txt'])
31
19
self.assertRaises(PointlessCommit,
20
b.working_tree().commit,
33
21
'commit without adding',
34
22
allow_pointless=False)
36
b.commit('commit pointless tree',
24
b.working_tree().commit('commit pointless tree',
37
25
allow_pointless=True)
27
b.working_tree().add('hello.txt')
41
b.commit('commit first added file',
29
b.working_tree().commit('commit first added file',
42
30
allow_pointless=False)
44
32
self.assertRaises(PointlessCommit,
33
b.working_tree().commit,
46
34
'commit after adding file',
47
35
allow_pointless=False)
49
b.commit('commit pointless revision with one file',
37
b.working_tree().commit('commit pointless revision with one file',
50
38
allow_pointless=True)
52
b.add_pending_merge('mbp@892739123-2005-123123')
53
b.commit('commit new merge with no text changes',
54
allow_pointless=False)
58
class ValidateRevisionId(TestCase):
60
from bzrlib.revision import validate_revision_id
61
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
63
self.assertRaises(ValueError,
68
self.assertRaises(ValueError,
70
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
73
self.assertRaises(ValueError,
75
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
77
self.assertRaises(ValueError,
79
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
83
class PendingMerges(InTempDir):
84
"""Tracking pending-merged revisions."""
86
b = Branch('.', init=True)
88
self.assertEquals(b.pending_merges(), [])
90
b.add_pending_merge('foo@azkhazan-123123-abcabc')
92
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
94
b.add_pending_merge('foo@azkhazan-123123-abcabc')
96
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
98
b.add_pending_merge('wibble@fofof--20050401--1928390812')
99
self.assertEquals(b.pending_merges(),
100
['foo@azkhazan-123123-abcabc',
101
'wibble@fofof--20050401--1928390812'])
103
b.commit("commit from base with two merges")
105
rev = b.get_revision(b.revision_history()[0])
106
self.assertEquals(len(rev.parents), 2)
107
self.assertEquals(rev.parents[0].revision_id,
108
'foo@azkhazan-123123-abcabc')
109
self.assertEquals(rev.parents[1].revision_id,
110
'wibble@fofof--20050401--1928390812')
112
# list should be cleared when we do a commit
113
self.assertEquals(b.pending_merges(), [])
118
class Revert(InTempDir):
119
"""Test selected-file revert"""
121
b = Branch('.', init=True)
123
self.build_tree(['hello.txt'])
124
file('hello.txt', 'w').write('initial hello')
126
self.assertRaises(NotVersionedError,
127
b.revert, ['hello.txt'])
130
b.commit('create initial hello.txt')
132
self.check_file_contents('hello.txt', 'initial hello')
133
file('hello.txt', 'w').write('new hello')
134
self.check_file_contents('hello.txt', 'new hello')
136
# revert file modified since last revision
137
b.revert(['hello.txt'])
138
self.check_file_contents('hello.txt', 'initial hello')
139
self.check_file_contents('hello.txt~', 'new hello')
141
# reverting again clobbers the backup
142
b.revert(['hello.txt'])
143
self.check_file_contents('hello.txt', 'initial hello')
144
self.check_file_contents('hello.txt~', 'initial hello')
148
class RenameDirs(InTempDir):
149
"""Test renaming directories and the files within them."""
151
b = Branch('.', init=True)
41
class MoreTests(TestCaseInTempDir):
43
def test_rename_dirs(self):
44
"""Test renaming directories and the files within them."""
45
b = Branch.initialize(u'.')
152
46
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
153
b.add(['dir', 'dir/sub', 'dir/sub/file'])
47
b.working_tree().add(['dir', 'dir/sub', 'dir/sub/file'])
155
b.commit('create initial state')
49
b.working_tree().commit('create initial state')
157
51
# TODO: lift out to a test helper that checks the shape of
166
60
self.check_inventory_shape(inv,
167
61
['dir', 'dir/sub', 'dir/sub/file'])
169
b.rename_one('dir', 'newdir')
63
b.working_tree().rename_one('dir', 'newdir')
171
self.check_inventory_shape(b.inventory,
65
self.check_inventory_shape(b.working_tree().read_working_inventory(),
172
66
['newdir', 'newdir/sub', 'newdir/sub/file'])
174
b.rename_one('newdir/sub', 'newdir/newsub')
175
self.check_inventory_shape(b.inventory,
68
b.working_tree().rename_one('newdir/sub', 'newdir/newsub')
69
self.check_inventory_shape(b.working_tree().read_working_inventory(),
176
70
['newdir', 'newdir/newsub',
177
71
'newdir/newsub/file'])
182
class BranchPathTestCase(TestCase):
183
"""test for branch path lookups
185
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
186
job: given a path (either relative to cwd or absolute), work out
187
if it is inside a branch and return the path relative to the base.
191
from bzrlib.branch import _relpath
73
def test_relpath(self):
74
"""test for branch path lookups
76
bzrlib.osutils._relpath do a simple but subtle
77
job: given a path (either relative to cwd or absolute), work out
78
if it is inside a branch and return the path relative to the base.
80
from bzrlib.osutils import relpath
192
81
import tempfile, shutil
194
83
savedir = os.getcwdu()
added
removed
bzrlib/tests/test_whitebox.py
