← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-18 02:24:28 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050818022428-4c0bf84005f4dba8
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/versioning.py
17
17
 
18
18
"""Tests of simple versioning operations"""
19
19
 
20
 
 
21
 
from bzrlib.selftest import InTempDir
 
20
# TODO: test adding a file whose directory is not versioned
 
21
# TODO: test trying to commit within a directory that is not yet added
 
22
 
 
23
 
 
24
import os
 
25
from bzrlib.selftest import InTempDir, BzrTestBase
 
26
from bzrlib.branch import Branch
 
27
 
22
28
 
23
29
class Mkdir(InTempDir):
24
30
    def runTest(self): 
25
31
        """Basic 'bzr mkdir' operation"""
26
32
        from bzrlib.commands import run_bzr
27
 
        import os
28
33
 
29
34
        run_bzr(['init'])
30
35
        run_bzr(['mkdir', 'foo'])
32
37
 
33
38
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
34
39
 
35
 
        from bzrlib.diff import compare_trees, TreeDelta
 
40
        from bzrlib.diff import compare_trees
36
41
        from bzrlib.branch import Branch
37
42
        b = Branch('.')
38
43
        
39
44
        delta = compare_trees(b.basis_tree(), b.working_tree())
40
45
 
 
46
        self.log('delta.added = %r' % delta.added)
 
47
 
41
48
        self.assertEquals(len(delta.added), 1)
42
49
        self.assertEquals(delta.added[0][0], 'foo')
43
50
        self.failIf(delta.modified)
52
59
        branch add doesn't do that.
53
60
        """
54
61
        from bzrlib.branch import Branch
55
 
        import os
56
62
        from bzrlib.errors import NotVersionedError
57
63
 
58
64
        b = Branch('.', init=True)
65
71
                          'foo/hello')
66
72
        
67
73
        
68
 
class SubdirCommit(InTempDir):
69
 
    def runTest(self):
70
 
        """Various commits from a subdirectory"""
 
74
class SubdirCommit(BzrTestBase):
 
75
    def runTest(self):
 
76
        """Test committing a subdirectory, and committing within a directory."""
 
77
        run_bzr = self.run_bzr
 
78
        eq = self.assertEqual
 
79
 
 
80
        self.build_tree(['a/', 'b/'])
 
81
        
 
82
        run_bzr('init')
 
83
        b = Branch('.')
 
84
        
 
85
        for fn in ('a/one', 'b/two', 'top'):
 
86
            file(fn, 'w').write('old contents')
 
87
            
 
88
        run_bzr('add')
 
89
        run_bzr('commit', '-m', 'first revision')
 
90
        
 
91
        for fn in ('a/one', 'b/two', 'top'):
 
92
            file(fn, 'w').write('new contents')
 
93
            
 
94
        run_bzr('commit', 'a', '-m', 'commit a only')
 
95
        
 
96
        old = b.revision_tree(b.lookup_revision(1))
 
97
        new = b.revision_tree(b.lookup_revision(2))
 
98
        
 
99
        eq(new.get_file_by_path('b/two').read(), 'old contents')
 
100
        eq(new.get_file_by_path('top').read(), 'old contents')
 
101
        eq(new.get_file_by_path('a/one').read(), 'new contents')
 
102
        
 
103
        os.chdir('a')
 
104
        # commit from here should do nothing
 
105
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
 
106
        v3 = b.revision_tree(b.lookup_revision(3))
 
107
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
 
108
        eq(v3.get_file_by_path('top').read(), 'old contents')
 
109
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
 
110
                
 
111
        # commit in subdirectory commits whole tree
 
112
        run_bzr('commit', '-m', 'commit whole tree from subdir')
 
113
        v4 = b.revision_tree(b.lookup_revision(4))
 
114
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
 
115
        eq(v4.get_file_by_path('top').read(), 'new contents')
 
116
        
 
117
        # TODO: factor out some kind of assert_tree_state() method
 
118
        
 
119
        
 
120
        
 
121
class SubdirAdd(InTempDir):
 
122
    def runTest(self):
 
123
        """Add in subdirectory should add only things from there down"""
71
124
        
72
125
        from bzrlib.branch import Branch
73
126
        from bzrlib.commands import run_bzr
74
 
        import os
 
127
        
 
128
        eq = self.assertEqual
 
129
        ass = self.assert_
 
130
        chdir = os.chdir
75
131
        
76
132
        b = Branch('.', init=True)
77
 
        self.build_tree(['src/', 'src/foo.c', 'README'])
78
 
        
79
 
        self.assertEqual(sorted(b.unknowns()),
80
 
                         ['README', 'src'])
81
 
        
82
 
        self.assertEqual(run_bzr(['version']), 0)
83
 
        
84
 
        self.assertEqual(run_bzr(['add']), 0)
85
 
        
86
 
        
87
 
 
88
 
 
89
 
TEST_CLASSES = [
90
 
    Mkdir,
91
 
    AddInUnversioned,
92
 
    ]
 
133
        self.build_tree(['src/', 'README'])
 
134
        
 
135
        eq(sorted(b.unknowns()),
 
136
           ['README', 'src'])
 
137
        
 
138
        eq(run_bzr(['add', 'src']), 0)
 
139
        
 
140
        self.build_tree(['src/foo.c'])
 
141
        
 
142
        chdir('src')
 
143
        eq(run_bzr(['add']), 0)
 
144
        
 
145
        eq(sorted(b.unknowns()), 
 
146
           ['README'])
 
147
        eq(len(b.inventory), 3)
 
148
                
 
149
        chdir('..')
 
150
        eq(run_bzr(['add']), 0)
 
151
        eq(list(b.unknowns()), [])
 
152