1
# Copyright (C) 2005, 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
6
from bzrlib.selftest import TestCaseInTempDir, TestCase
7
from bzrlib.branch import ScratchBranch, Branch
8
from bzrlib.errors import NotBranchError, NotVersionedError
11
class TestBranch(TestCaseInTempDir):
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(TestCaseInTempDir):
77
def test_pending_merges(self):
78
"""Tracking pending-merged revisions."""
79
b = Branch('.', init=True)
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('.', init=True)
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')
127
def test_rename_dirs(self):
128
"""Test renaming directories and the files within them."""
129
b = Branch('.', init=True)
130
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
131
b.add(['dir', 'dir/sub', 'dir/sub/file'])
133
b.commit('create initial state')
135
# TODO: lift out to a test helper that checks the shape of
138
revid = b.revision_history()[0]
139
self.log('first revision_id is {%s}' % revid)
141
inv = b.get_revision_inventory(revid)
142
self.log('contents of inventory: %r' % inv.entries())
144
self.check_inventory_shape(inv,
145
['dir', 'dir/sub', 'dir/sub/file'])
147
b.rename_one('dir', 'newdir')
149
self.check_inventory_shape(b.inventory,
150
['newdir', 'newdir/sub', 'newdir/sub/file'])
152
b.rename_one('newdir/sub', 'newdir/newsub')
153
self.check_inventory_shape(b.inventory,
154
['newdir', 'newdir/newsub',
155
'newdir/newsub/file'])
23
from bzrlib.tests import TestCaseWithTransport, TestCase
24
from bzrlib.branch import Branch
25
from bzrlib.errors import PathNotChild
26
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
29
class MoreTests(TestCaseWithTransport):
157
31
def test_relpath(self):
158
32
"""test for branch path lookups
160
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
34
bzrlib.osutils._relpath do a simple but subtle
161
35
job: given a path (either relative to cwd or absolute), work out
162
36
if it is inside a branch and return the path relative to the base.
164
from bzrlib.branch import _relpath
165
import tempfile, shutil
167
40
savedir = os.getcwdu()
168
41
dtmp = tempfile.mkdtemp()
169
42
# On Mac OSX, /tmp actually expands to /private/tmp
170
dtmp = os.path.realpath(dtmp)
173
return _relpath(dtmp, p)
46
return relpath(dtmp, p)
176
49
# check paths inside dtmp while standing outside it
177
self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
50
self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
180
53
self.assertEqual(rp(dtmp), '')
182
self.assertRaises(NotBranchError,
55
self.assertRaises(PathNotChild,
186
59
# now some near-miss operations -- note that
187
60
# os.path.commonprefix gets these wrong!
188
self.assertRaises(NotBranchError,
61
self.assertRaises(PathNotChild,
190
63
dtmp.rstrip('\\/') + '2')
192
self.assertRaises(NotBranchError,
65
self.assertRaises(PathNotChild,
194
67
dtmp.rstrip('\\/') + '2/foo')
added
removed
bzrlib/tests/test_whitebox.py
