/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_versioning.py

  • Committer: Jelmer Vernooij
  • Date: 2020-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_versioning.py
 
1
# Copyright (C) 2005, 2006, 2007, 2009-2012, 2016 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
"""Tests of simple versioning operations"""
 
19
 
 
20
# TODO: test trying to commit within a directory that is not yet added
 
21
 
 
22
 
 
23
import os
 
24
 
 
25
from breezy.branch import Branch
 
26
from breezy.osutils import pathjoin
 
27
from breezy.tests import TestCaseInTempDir, TestCaseWithTransport
 
28
from breezy.trace import mutter
 
29
from breezy.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):
 
45
        """Basic 'brz mkdir' operation"""
 
46
 
 
47
        self.make_branch_and_tree('.')
 
48
        self.run_bzr(['mkdir', 'foo'])
 
49
        self.assertTrue(os.path.isdir('foo'))
 
50
 
 
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)
 
58
 
 
59
        self.assertEqual(len(delta.added), 1)
 
60
        self.assertEqual(delta.added[0].path[1], 'foo')
 
61
        self.assertFalse(delta.modified)
 
62
 
 
63
    def test_mkdir_in_subdir(self):
 
64
        """'brz mkdir' operation in subdirectory"""
 
65
 
 
66
        self.make_branch_and_tree('.')
 
67
        self.run_bzr(['mkdir', 'dir'])
 
68
        self.assertTrue(os.path.isdir('dir'))
 
69
 
 
70
        self.log('Run mkdir in subdir')
 
71
        self.run_bzr(['mkdir', 'subdir'], working_dir='dir')
 
72
        self.assertTrue(os.path.isdir('dir/subdir'))
 
73
 
 
74
        wt = WorkingTree.open('.')
 
75
 
 
76
        delta = wt.changes_from(wt.basis_tree())
 
77
 
 
78
        self.log('delta.added = %r' % delta.added)
 
79
 
 
80
        self.assertEqual(len(delta.added), 2)
 
81
        self.assertEqual(delta.added[0].path[1], 'dir')
 
82
        self.assertEqual(delta.added[1].path[1], pathjoin('dir', 'subdir'))
 
83
        self.assertFalse(delta.modified)
 
84
 
 
85
    def test_mkdir_w_nested_trees(self):
 
86
        """'brz mkdir' with nested trees"""
 
87
 
 
88
        self.make_branch_and_tree('.')
 
89
        self.make_branch_and_tree('a')
 
90
        self.make_branch_and_tree('a/b')
 
91
 
 
92
        self.run_bzr(['mkdir', 'dir', 'a/dir', 'a/b/dir'])
 
93
        self.assertTrue(os.path.isdir('dir'))
 
94
        self.assertTrue(os.path.isdir('a/dir'))
 
95
        self.assertTrue(os.path.isdir('a/b/dir'))
 
96
 
 
97
        wt = WorkingTree.open('.')
 
98
        wt_a = WorkingTree.open('a')
 
99
        wt_b = WorkingTree.open('a/b')
 
100
 
 
101
        delta = wt.changes_from(wt.basis_tree())
 
102
        self.assertEqual(len(delta.added), 1)
 
103
        self.assertEqual(delta.added[0].path[1], 'dir')
 
104
        self.assertFalse(delta.modified)
 
105
 
 
106
        delta = wt_a.changes_from(wt_a.basis_tree())
 
107
        self.assertEqual(len(delta.added), 1)
 
108
        self.assertEqual(delta.added[0].path[1], 'dir')
 
109
        self.assertFalse(delta.modified)
 
110
 
 
111
        delta = wt_b.changes_from(wt_b.basis_tree())
 
112
        self.assertEqual(len(delta.added), 1)
 
113
        self.assertEqual(delta.added[0].path[1], 'dir')
 
114
        self.assertFalse(delta.modified)
 
115
 
 
116
    def test_mkdir_quiet(self):
 
117
        """'brz mkdir --quiet' should not print a status message"""
 
118
 
 
119
        self.make_branch_and_tree('.')
 
120
        out, err = self.run_bzr(['mkdir', '--quiet', 'foo'])
 
121
        self.assertEqual('', err)
 
122
        self.assertEqual('', out)
 
123
 
 
124
 
 
125
class SubdirCommit(TestCaseWithTransport):
 
126
 
 
127
    def test_subdir_commit(self):
 
128
        """Test committing a subdirectory, and committing a directory."""
 
129
        tree = self.make_branch_and_tree('.')
 
130
        b = tree.branch
 
131
        self.build_tree(['a/', 'b/'])
 
132
 
 
133
        def set_contents(contents):
 
134
            self.build_tree_contents([
 
135
                ('a/one', contents),
 
136
                ('b/two', contents),
 
137
                ('top', contents),
 
138
                ])
 
139
        set_contents(b'old contents')
 
140
        tree.smart_add(['.'])
 
141
        tree.commit('first revision')
 
142
        set_contents(b'new contents')
 
143
 
 
144
        mutter('start selective subdir commit')
 
145
        self.run_bzr(['commit', 'a', '-m', 'commit a only'])
 
146
 
 
147
        new = b.repository.revision_tree(b.get_rev_id(2))
 
148
        new.lock_read()
 
149
 
 
150
        def get_text_by_path(tree, path):
 
151
            return tree.get_file_text(path)
 
152
 
 
153
        self.assertEqual(get_text_by_path(new, 'b/two'), b'old contents')
 
154
        self.assertEqual(get_text_by_path(new, 'top'), b'old contents')
 
155
        self.assertEqual(get_text_by_path(new, 'a/one'), b'new contents')
 
156
        new.unlock()
 
157
 
 
158
        # commit from here should do nothing
 
159
        self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'],
 
160
                     working_dir='a')
 
161
        v3 = b.repository.revision_tree(b.get_rev_id(3))
 
162
        v3.lock_read()
 
163
        self.assertEqual(get_text_by_path(v3, 'b/two'), b'old contents')
 
164
        self.assertEqual(get_text_by_path(v3, 'top'), b'old contents')
 
165
        self.assertEqual(get_text_by_path(v3, 'a/one'), b'new contents')
 
166
        v3.unlock()
 
167
 
 
168
        # commit in subdirectory commits whole tree
 
169
        self.run_bzr(['commit', '-m', 'commit whole tree from subdir'],
 
170
                     working_dir='a')
 
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'), b'new contents')
 
174
        self.assertEqual(get_text_by_path(v4, 'top'), b'new contents')
 
175
        v4.unlock()
 
176
 
 
177
        # TODO: factor out some kind of assert_tree_state() method