6
from bzrlib.selftest import InTempDir, TestCase
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
7
5
from bzrlib.branch import ScratchBranch, Branch
8
6
from bzrlib.errors import NotBranchError, NotVersionedError
11
class Unknowns(InTempDir):
13
b = Branch('.', init=True)
9
class TestBranch(TestCaseInTempDir):
11
def test_unknowns(self):
12
b = Branch.initialize('.')
15
14
self.build_tree(['hello.txt',
18
17
self.assertEquals(list(b.unknowns()),
23
class NoChanges(InTempDir):
20
def test_no_changes(self):
25
21
from bzrlib.errors import PointlessCommit
27
b = Branch('.', init=True)
23
b = Branch.initialize('.')
29
25
self.build_tree(['hello.txt'])
49
45
b.commit('commit pointless revision with one file',
50
46
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)
49
class MoreTests(TestCaseInTempDir):
51
def test_revert(self):
52
"""Test selected-file revert"""
53
b = Branch.initialize('.')
123
55
self.build_tree(['hello.txt'])
124
56
file('hello.txt', 'w').write('initial hello')
143
75
self.check_file_contents('hello.txt', 'initial hello')
144
76
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)
78
def test_rename_dirs(self):
79
"""Test renaming directories and the files within them."""
80
b = Branch.initialize('.')
152
81
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
153
82
b.add(['dir', 'dir/sub', 'dir/sub/file'])
176
105
['newdir', 'newdir/newsub',
177
106
'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.
108
def test_relpath(self):
109
"""test for branch path lookups
111
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
112
job: given a path (either relative to cwd or absolute), work out
113
if it is inside a branch and return the path relative to the base.
191
115
from bzrlib.branch import _relpath
192
116
import tempfile, shutil
added
removed
bzrlib/selftest/whitebox.py
