1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
|
import os
import unittest
from bzrlib.tests import TestCaseInTempDir, TestCase
from bzrlib.branch import ScratchBranch, Branch
from bzrlib.errors import NotBranchError
class TestBranch(TestCaseInTempDir):
def test_no_changes(self):
from bzrlib.errors import PointlessCommit
b = Branch.initialize('.')
self.build_tree(['hello.txt'])
self.assertRaises(PointlessCommit,
b.working_tree().commit,
'commit without adding',
allow_pointless=False)
b.working_tree().commit('commit pointless tree',
allow_pointless=True)
b.working_tree().add('hello.txt')
b.working_tree().commit('commit first added file',
allow_pointless=False)
self.assertRaises(PointlessCommit,
b.working_tree().commit,
'commit after adding file',
allow_pointless=False)
b.working_tree().commit('commit pointless revision with one file',
allow_pointless=True)
class MoreTests(TestCaseInTempDir):
def test_rename_dirs(self):
"""Test renaming directories and the files within them."""
b = Branch.initialize('.')
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
b.working_tree().add(['dir', 'dir/sub', 'dir/sub/file'])
b.working_tree().commit('create initial state')
# TODO: lift out to a test helper that checks the shape of
# an inventory
revid = b.revision_history()[0]
self.log('first revision_id is {%s}' % revid)
inv = b.get_revision_inventory(revid)
self.log('contents of inventory: %r' % inv.entries())
self.check_inventory_shape(inv,
['dir', 'dir/sub', 'dir/sub/file'])
b.working_tree().rename_one('dir', 'newdir')
self.check_inventory_shape(b.working_tree().read_working_inventory(),
['newdir', 'newdir/sub', 'newdir/sub/file'])
b.working_tree().rename_one('newdir/sub', 'newdir/newsub')
self.check_inventory_shape(b.working_tree().read_working_inventory(),
['newdir', 'newdir/newsub',
'newdir/newsub/file'])
def test_relpath(self):
"""test for branch path lookups
bzrlib.osutils._relpath do a simple but subtle
job: given a path (either relative to cwd or absolute), work out
if it is inside a branch and return the path relative to the base.
"""
from bzrlib.osutils import relpath
import tempfile, shutil
savedir = os.getcwdu()
dtmp = tempfile.mkdtemp()
# On Mac OSX, /tmp actually expands to /private/tmp
dtmp = os.path.realpath(dtmp)
def rp(p):
return relpath(dtmp, p)
try:
# check paths inside dtmp while standing outside it
self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
# root = nothing
self.assertEqual(rp(dtmp), '')
self.assertRaises(NotBranchError,
rp,
'/etc')
# now some near-miss operations -- note that
# os.path.commonprefix gets these wrong!
self.assertRaises(NotBranchError,
rp,
dtmp.rstrip('\\/') + '2')
self.assertRaises(NotBranchError,
rp,
dtmp.rstrip('\\/') + '2/foo')
# now operations based on relpath of files in current
# directory, or nearby
os.chdir(dtmp)
FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
self.assertEqual(rp('foo'), 'foo')
self.assertEqual(rp('./foo'), 'foo')
self.assertEqual(rp(os.path.abspath('foo')), 'foo')
self.assertRaises(NotBranchError,
rp, '../foo')
finally:
os.chdir(savedir)
shutil.rmtree(dtmp)
|