← 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
  • Date: 2005-07-26 14:06:11 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 982.
  • Revision ID: abentley@panoramicfeedback.com-20050726140611-403e366f3c79c1f1
Fixed python invocation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/versioning.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
2
 
#
 
1
# Copyright (C) 2005 by Canonical Ltd
 
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
"""Tests of simple versioning operations"""
19
19
 
20
 
# TODO: test trying to commit within a directory that is not yet added
21
 
 
22
 
 
23
 
import os
24
 
 
25
 
from bzrlib.branch import Branch
26
 
from bzrlib.osutils import pathjoin
27
 
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
28
 
from bzrlib.trace import mutter
29
 
from bzrlib.workingtree import WorkingTree
30
 
 
31
 
 
32
 
class TestMkdir(TestCaseWithTransport):
33
 
 
34
 
    def test_mkdir_fails_cleanly(self):
35
 
        """'mkdir' fails cleanly when no working tree is available.
36
 
        https://bugs.launchpad.net/bzr/+bug/138600
37
 
        """
38
 
        # Since there is a safety working tree above us, we create a bare repo
39
 
        # here locally.
40
 
        shared_repo = self.make_repository('.')
41
 
        self.run_bzr(['mkdir', 'abc'], retcode=3)
42
 
        self.assertPathDoesNotExist('abc')
43
 
 
44
 
    def test_mkdir(self):
 
20
 
 
21
from bzrlib.selftest import InTempDir
 
22
 
 
23
class Mkdir(InTempDir):
 
24
    def runTest(self): 
45
25
        """Basic 'bzr mkdir' operation"""
 
26
        from bzrlib.commands import run_bzr
 
27
        import os
46
28
 
47
 
        self.make_branch_and_tree('.')
48
 
        self.run_bzr(['mkdir', 'foo'])
 
29
        run_bzr(['init'])
 
30
        run_bzr(['mkdir', 'foo'])
49
31
        self.assert_(os.path.isdir('foo'))
50
32
 
51
 
        self.run_bzr(['mkdir', 'foo'], retcode=3)
52
 
 
53
 
        wt = WorkingTree.open('.')
54
 
 
55
 
        delta = wt.changes_from(wt.basis_tree())
56
 
 
57
 
        self.log('delta.added = %r' % delta.added)
 
33
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
 
34
 
 
35
        from bzrlib.diff import compare_trees, TreeDelta
 
36
        from bzrlib.branch import Branch
 
37
        b = Branch('.')
 
38
        
 
39
        delta = compare_trees(b.basis_tree(), b.working_tree())
58
40
 
59
41
        self.assertEquals(len(delta.added), 1)
60
42
        self.assertEquals(delta.added[0][0], 'foo')
61
 
        self.assertFalse(delta.modified)
62
 
 
63
 
    def test_mkdir_in_subdir(self):
64
 
        """'bzr mkdir' operation in subdirectory"""
65
 
 
66
 
        self.make_branch_and_tree('.')
67
 
        self.run_bzr(['mkdir', 'dir'])
68
 
        self.assert_(os.path.isdir('dir'))
69
 
 
70
 
        os.chdir('dir')
71
 
        self.log('Run mkdir in subdir')
72
 
        self.run_bzr(['mkdir', 'subdir'])
73
 
        self.assert_(os.path.isdir('subdir'))
74
 
        os.chdir('..')
75
 
 
76
 
        wt = WorkingTree.open('.')
77
 
 
78
 
        delta = wt.changes_from(wt.basis_tree())
79
 
 
80
 
        self.log('delta.added = %r' % delta.added)
81
 
 
82
 
        self.assertEquals(len(delta.added), 2)
83
 
        self.assertEquals(delta.added[0][0], 'dir')
84
 
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
85
 
        self.assertFalse(delta.modified)
86
 
 
87
 
    def test_mkdir_w_nested_trees(self):
88
 
        """'bzr mkdir' with nested trees"""
89
 
 
90
 
        self.make_branch_and_tree('.')
91
 
        self.make_branch_and_tree('a')
92
 
        self.make_branch_and_tree('a/b')
93
 
 
94
 
        self.run_bzr(['mkdir', 'dir', 'a/dir', 'a/b/dir'])
95
 
        self.assertTrue(os.path.isdir('dir'))
96
 
        self.assertTrue(os.path.isdir('a/dir'))
97
 
        self.assertTrue(os.path.isdir('a/b/dir'))
98
 
 
99
 
        wt = WorkingTree.open('.')
100
 
        wt_a = WorkingTree.open('a')
101
 
        wt_b = WorkingTree.open('a/b')
102
 
 
103
 
        delta = wt.changes_from(wt.basis_tree())
104
 
        self.assertEquals(len(delta.added), 1)
105
 
        self.assertEquals(delta.added[0][0], 'dir')
106
 
        self.assertFalse(delta.modified)
107
 
 
108
 
        delta = wt_a.changes_from(wt_a.basis_tree())
109
 
        self.assertEquals(len(delta.added), 1)
110
 
        self.assertEquals(delta.added[0][0], 'dir')
111
 
        self.assertFalse(delta.modified)
112
 
 
113
 
        delta = wt_b.changes_from(wt_b.basis_tree())
114
 
        self.assertEquals(len(delta.added), 1)
115
 
        self.assertEquals(delta.added[0][0], 'dir')
116
 
        self.assertFalse(delta.modified)
117
 
 
118
 
    def test_mkdir_quiet(self):
119
 
        """'bzr mkdir --quiet' should not print a status message"""
120
 
 
121
 
        self.make_branch_and_tree('.')
122
 
        out, err = self.run_bzr(['mkdir', '--quiet', 'foo'])
123
 
        self.assertEquals('', err)
124
 
        self.assertEquals('', out)
125
 
 
126
 
 
127
 
class SubdirCommit(TestCaseWithTransport):
128
 
 
129
 
    def test_subdir_commit(self):
130
 
        """Test committing a subdirectory, and committing a directory."""
131
 
        tree = self.make_branch_and_tree('.')
132
 
        b = tree.branch
133
 
        self.build_tree(['a/', 'b/'])
134
 
        def set_contents(contents):
135
 
            self.build_tree_contents([
136
 
                ('a/one', contents),
137
 
                ('b/two', contents),
138
 
                ('top', contents),
139
 
                ])
140
 
        set_contents('old contents')
141
 
        tree.smart_add(['.'])
142
 
        tree.commit('first revision')
143
 
        set_contents('new contents')
144
 
 
145
 
        mutter('start selective subdir commit')
146
 
        self.run_bzr(['commit', 'a', '-m', 'commit a only'])
147
 
 
148
 
        new = b.repository.revision_tree(b.get_rev_id(2))
149
 
        new.lock_read()
150
 
 
151
 
        def get_text_by_path(tree, path):
152
 
            return tree.get_file_text(tree.path2id(path), path)
153
 
 
154
 
        self.assertEqual(get_text_by_path(new, 'b/two'), 'old contents')
155
 
        self.assertEqual(get_text_by_path(new, 'top'), 'old contents')
156
 
        self.assertEqual(get_text_by_path(new, 'a/one'), 'new contents')
157
 
        new.unlock()
158
 
 
159
 
        os.chdir('a')
160
 
        # commit from here should do nothing
161
 
        self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'])
162
 
        v3 = b.repository.revision_tree(b.get_rev_id(3))
163
 
        v3.lock_read()
164
 
        self.assertEqual(get_text_by_path(v3, 'b/two'), 'old contents')
165
 
        self.assertEqual(get_text_by_path(v3, 'top'), 'old contents')
166
 
        self.assertEqual(get_text_by_path(v3, 'a/one'), 'new contents')
167
 
        v3.unlock()
168
 
 
169
 
        # commit in subdirectory commits whole tree
170
 
        self.run_bzr(['commit', '-m', 'commit whole tree from subdir'])
171
 
        v4 = b.repository.revision_tree(b.get_rev_id(4))
172
 
        v4.lock_read()
173
 
        self.assertEqual(get_text_by_path(v4, 'b/two'), 'new contents')
174
 
        self.assertEqual(get_text_by_path(v4, 'top'), 'new contents')
175
 
        v4.unlock()
176
 
 
177
 
        # TODO: factor out some kind of assert_tree_state() method
 
43
        self.failIf(delta.modified)
 
44
 
 
45
 
 
46
 
 
47
class AddInUnversioned(InTempDir):
 
48
    def runTest(self):
 
49
        """Try to add a file in an unversioned directory.
 
50
 
 
51
        smart_add may eventually add the parent as necessary, but simple
 
52
        branch add doesn't do that.
 
53
        """
 
54
        from bzrlib.branch import Branch
 
55
        import os
 
56
        from bzrlib.errors import NotVersionedError
 
57
 
 
58
        b = Branch('.', init=True)
 
59
 
 
60
        self.build_tree(['foo/',
 
61
                         'foo/hello'])
 
62
 
 
63
        self.assertRaises(NotVersionedError,
 
64
                          b.add,
 
65
                          'foo/hello')
 
66
        
 
67
        
 
68
class SubdirCommit(InTempDir):
 
69
    def runTest(self):
 
70
        """Various commits from a subdirectory"""
 
71
        
 
72
        from bzrlib.branch import Branch
 
73
        from bzrlib.commands import run_bzr
 
74
        import os
 
75
        
 
76
        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
    ]