~bzr-pqm/bzr/bzr.dev

743 by Martin Pool
- new simple versioning test cases
1
# Copyright (C) 2005 by Canonical Ltd
2
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.
7
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.
12
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
16
17
18
"""Tests of simple versioning operations"""
19
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
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
743 by Martin Pool
- new simple versioning test cases
28
29
class Mkdir(InTempDir):
30
    def runTest(self): 
744 by Martin Pool
- show nicer descriptions while running tests
31
        """Basic 'bzr mkdir' operation"""
743 by Martin Pool
- new simple versioning test cases
32
        from bzrlib.commands import run_bzr
33
974 by Martin Pool
- start adding tests for commit in subdir
34
        run_bzr(['init'])
35
        run_bzr(['mkdir', 'foo'])
743 by Martin Pool
- new simple versioning test cases
36
        self.assert_(os.path.isdir('foo'))
37
974 by Martin Pool
- start adding tests for commit in subdir
38
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
749 by Martin Pool
- More tests for bzr mkdir
39
40
        from bzrlib.diff import compare_trees, TreeDelta
41
        from bzrlib.branch import Branch
42
        b = Branch('.')
43
        
44
        delta = compare_trees(b.basis_tree(), b.working_tree())
45
46
        self.assertEquals(len(delta.added), 1)
47
        self.assertEquals(delta.added[0][0], 'foo')
48
        self.failIf(delta.modified)
49
754 by Martin Pool
- new check for attempting to add a file in an unversioned
50
51
52
class AddInUnversioned(InTempDir):
53
    def runTest(self):
54
        """Try to add a file in an unversioned directory.
55
56
        smart_add may eventually add the parent as necessary, but simple
57
        branch add doesn't do that.
58
        """
59
        from bzrlib.branch import Branch
60
        from bzrlib.errors import NotVersionedError
61
62
        b = Branch('.', init=True)
63
64
        self.build_tree(['foo/',
65
                         'foo/hello'])
66
67
        self.assertRaises(NotVersionedError,
68
                          b.add,
69
                          'foo/hello')
70
        
974 by Martin Pool
- start adding tests for commit in subdir
71
        
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
72
class SubdirCommit(BzrTestBase):
974 by Martin Pool
- start adding tests for commit in subdir
73
    def runTest(self):
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
74
        """Test committing a subdirectory, and committing within a directory."""
75
        run_bzr = self.run_bzr
76
        eq = self.assertEqual
77
78
        self.build_tree(['a/', 'b/'])
79
        
80
        run_bzr('init')
81
        b = Branch('.')
82
        
83
        for fn in ('a/one', 'b/two', 'top'):
84
            file(fn, 'w').write('old contents')
85
            
86
        run_bzr('add')
87
        run_bzr('commit', '-m', 'first revision')
88
        
89
        for fn in ('a/one', 'b/two', 'top'):
90
            file(fn, 'w').write('new contents')
91
            
92
        run_bzr('commit', 'a', '-m', 'commit a only')
93
        
94
        old = b.revision_tree(b.lookup_revision(1))
95
        new = b.revision_tree(b.lookup_revision(2))
96
        
97
        eq(new.get_file_by_path('b/two').read(), 'old contents')
98
        eq(new.get_file_by_path('top').read(), 'old contents')
99
        eq(new.get_file_by_path('a/one').read(), 'new contents')
100
        
101
        os.chdir('a')
102
        # commit from here should do nothing
980 by Martin Pool
- bzr commit from subdirectory should commit the whole tree
103
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
104
        v3 = b.revision_tree(b.lookup_revision(3))
105
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
106
        eq(v3.get_file_by_path('top').read(), 'old contents')
107
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
108
                
109
        # commit in subdirectory commits whole tree
980 by Martin Pool
- bzr commit from subdirectory should commit the whole tree
110
        run_bzr('commit', '-m', 'commit whole tree from subdir')
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
111
        v4 = b.revision_tree(b.lookup_revision(4))
112
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
113
        eq(v4.get_file_by_path('top').read(), 'new contents')
114
        
115
        # TODO: factor out some kind of assert_tree_state() method
116
        
976 by Martin Pool
- refactor SubdirAdd tests
117
        
118
        
119
class SubdirAdd(InTempDir):
120
    def runTest(self):
121
        """Add in subdirectory should add only things from there down"""
974 by Martin Pool
- start adding tests for commit in subdir
122
        
123
        from bzrlib.branch import Branch
124
        from bzrlib.commands import run_bzr
125
        
975 by Martin Pool
- more checks for some operations in subdirectories
126
        eq = self.assertEqual
127
        ass = self.assert_
128
        chdir = os.chdir
129
        
974 by Martin Pool
- start adding tests for commit in subdir
130
        b = Branch('.', init=True)
976 by Martin Pool
- refactor SubdirAdd tests
131
        self.build_tree(['src/', 'README'])
974 by Martin Pool
- start adding tests for commit in subdir
132
        
975 by Martin Pool
- more checks for some operations in subdirectories
133
        eq(sorted(b.unknowns()),
976 by Martin Pool
- refactor SubdirAdd tests
134
           ['README', 'src'])
135
        
136
        eq(run_bzr(['add', 'src']), 0)
137
        
138
        self.build_tree(['src/foo.c'])
139
        
975 by Martin Pool
- more checks for some operations in subdirectories
140
        chdir('src')
141
        eq(run_bzr(['add']), 0)
142
        
976 by Martin Pool
- refactor SubdirAdd tests
143
        eq(sorted(b.unknowns()), 
144
           ['README'])
145
        eq(len(b.inventory), 3)
146
                
147
        chdir('..')
148
        eq(run_bzr(['add']), 0)
149
        eq(list(b.unknowns()), [])
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
150