/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
963 by Martin Pool
- add the start of a test for inventory file-id matching
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
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
17
from cStringIO import StringIO
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
18
import os
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
19
20
from bzrlib.branch import Branch
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
21
import bzrlib.errors as errors
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
22
from bzrlib.diff import internal_diff
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
23
from bzrlib.inventory import Inventory, ROOT_ID
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
24
import bzrlib.inventory as inventory
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
25
from bzrlib.osutils import has_symlinks, rename, pathjoin
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
26
from bzrlib.tests import TestCase, TestCaseWithTransport
1551.2.54 by abentley
Fixed executability test
27
from bzrlib.transform import TreeTransform
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
28
from bzrlib.uncommit import uncommit
963 by Martin Pool
- add the start of a test for inventory file-id matching
29
969 by Martin Pool
- Add less-sucky is_within_any
30
1102 by Martin Pool
- merge test refactoring from robertc
31
class TestInventory(TestCase):
32
33
    def test_is_within(self):
968 by Martin Pool
- add some passing tests for is_inside_any
34
        from bzrlib.osutils import is_inside_any
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
35
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
36
        SRC_FOO_C = pathjoin('src', 'foo.c')
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
37
        for dirs, fn in [(['src', 'doc'], SRC_FOO_C),
38
                         (['src'], SRC_FOO_C),
968 by Martin Pool
- add some passing tests for is_inside_any
39
                         (['src'], 'src'),
40
                         ]:
41
            self.assert_(is_inside_any(dirs, fn))
42
            
969 by Martin Pool
- Add less-sucky is_within_any
43
        for dirs, fn in [(['src'], 'srccontrol'),
44
                         (['src'], 'srccontrol/foo')]:
45
            self.assertFalse(is_inside_any(dirs, fn))
46
            
1102 by Martin Pool
- merge test refactoring from robertc
47
    def test_ids(self):
963 by Martin Pool
- add the start of a test for inventory file-id matching
48
        """Test detection of files within selected directories."""
49
        inv = Inventory()
50
        
51
        for args in [('src', 'directory', 'src-id'), 
52
                     ('doc', 'directory', 'doc-id'), 
53
                     ('src/hello.c', 'file'),
54
                     ('src/bye.c', 'file', 'bye-id'),
55
                     ('Makefile', 'file')]:
56
            inv.add_path(*args)
57
            
58
        self.assertEqual(inv.path2id('src'), 'src-id')
59
        self.assertEqual(inv.path2id('src/bye.c'), 'bye-id')
60
        
61
        self.assert_('src-id' in inv)
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
62
63
64
    def test_version(self):
65
        """Inventory remembers the text's version."""
66
        inv = Inventory()
67
        ie = inv.add_path('foo.txt', 'file')
68
        ## XXX
69
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
70
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
71
class TestInventoryEntry(TestCase):
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
72
73
    def test_file_kind_character(self):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
74
        file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
75
        self.assertEqual(file.kind_character(), '')
76
77
    def test_dir_kind_character(self):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
78
        dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
79
        self.assertEqual(dir.kind_character(), '/')
80
81
    def test_link_kind_character(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
82
        dir = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
83
        self.assertEqual(dir.kind_character(), '')
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
84
85
    def test_dir_detect_changes(self):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
86
        left = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
87
        left.text_sha1 = 123
88
        left.executable = True
89
        left.symlink_target='foo'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
90
        right = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
91
        right.text_sha1 = 321
92
        right.symlink_target='bar'
93
        self.assertEqual((False, False), left.detect_changes(right))
94
        self.assertEqual((False, False), right.detect_changes(left))
95
96
    def test_file_detect_changes(self):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
97
        left = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
98
        left.text_sha1 = 123
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
99
        right = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
100
        right.text_sha1 = 123
101
        self.assertEqual((False, False), left.detect_changes(right))
102
        self.assertEqual((False, False), right.detect_changes(left))
103
        left.executable = True
104
        self.assertEqual((False, True), left.detect_changes(right))
105
        self.assertEqual((False, True), right.detect_changes(left))
106
        right.text_sha1 = 321
107
        self.assertEqual((True, True), left.detect_changes(right))
108
        self.assertEqual((True, True), right.detect_changes(left))
109
110
    def test_symlink_detect_changes(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
111
        left = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
112
        left.text_sha1 = 123
113
        left.executable = True
114
        left.symlink_target='foo'
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
115
        right = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
116
        right.text_sha1 = 321
117
        right.symlink_target='foo'
118
        self.assertEqual((False, False), left.detect_changes(right))
119
        self.assertEqual((False, False), right.detect_changes(left))
120
        left.symlink_target = 'different'
121
        self.assertEqual((True, False), left.detect_changes(right))
122
        self.assertEqual((True, False), right.detect_changes(left))
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
123
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
124
    def test_file_has_text(self):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
125
        file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
126
        self.failUnless(file.has_text())
127
128
    def test_directory_has_text(self):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
129
        dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
130
        self.failIf(dir.has_text())
131
132
    def test_link_has_text(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
133
        link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
134
        self.failIf(link.has_text())
135
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
136
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
137
class TestEntryDiffing(TestCaseWithTransport):
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
138
139
    def setUp(self):
140
        super(TestEntryDiffing, self).setUp()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
141
        self.wt = self.make_branch_and_tree('.')
142
        self.branch = self.wt.branch
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
143
        print >> open('file', 'wb'), 'foo'
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
144
        print >> open('binfile', 'wb'), 'foo'
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
145
        self.wt.add(['file'], ['fileid'])
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
146
        self.wt.add(['binfile'], ['binfileid'])
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
147
        if has_symlinks():
148
            os.symlink('target1', 'symlink')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
149
            self.wt.add(['symlink'], ['linkid'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
150
        self.wt.commit('message_1', rev_id = '1')
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
151
        print >> open('file', 'wb'), 'bar'
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
152
        print >> open('binfile', 'wb'), 'x' * 1023 + '\x00'
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
153
        if has_symlinks():
154
            os.unlink('symlink')
155
            os.symlink('target2', 'symlink')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
156
        self.tree_1 = self.branch.repository.revision_tree('1')
157
        self.inv_1 = self.branch.repository.get_inventory('1')
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
158
        self.file_1 = self.inv_1['fileid']
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
159
        self.file_1b = self.inv_1['binfileid']
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
160
        self.tree_2 = self.wt
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
161
        self.inv_2 = self.tree_2.read_working_inventory()
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
162
        self.file_2 = self.inv_2['fileid']
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
163
        self.file_2b = self.inv_2['binfileid']
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
164
        if has_symlinks():
165
            self.link_1 = self.inv_1['linkid']
166
            self.link_2 = self.inv_2['linkid']
167
168
    def test_file_diff_deleted(self):
169
        output = StringIO()
170
        self.file_1.diff(internal_diff, 
171
                          "old_label", self.tree_1,
172
                          "/dev/null", None, None,
173
                          output)
1185.35.29 by Aaron Bentley
Support whitespace in diff filenames
174
        self.assertEqual(output.getvalue(), "--- old_label\t\n"
175
                                            "+++ /dev/null\t\n"
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
176
                                            "@@ -1,1 +0,0 @@\n"
177
                                            "-foo\n"
178
                                            "\n")
179
180
    def test_file_diff_added(self):
181
        output = StringIO()
182
        self.file_1.diff(internal_diff, 
183
                          "new_label", self.tree_1,
184
                          "/dev/null", None, None,
185
                          output, reverse=True)
1185.35.29 by Aaron Bentley
Support whitespace in diff filenames
186
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
187
                                            "+++ new_label\t\n"
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
188
                                            "@@ -0,0 +1,1 @@\n"
189
                                            "+foo\n"
190
                                            "\n")
191
192
    def test_file_diff_changed(self):
193
        output = StringIO()
194
        self.file_1.diff(internal_diff, 
195
                          "/dev/null", self.tree_1, 
196
                          "new_label", self.file_2, self.tree_2,
197
                          output)
1185.35.29 by Aaron Bentley
Support whitespace in diff filenames
198
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
199
                                            "+++ new_label\t\n"
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
200
                                            "@@ -1,1 +1,1 @@\n"
201
                                            "-foo\n"
202
                                            "+bar\n"
203
                                            "\n")
204
        
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
205
    def test_file_diff_binary(self):
206
        output = StringIO()
207
        self.file_1.diff(internal_diff, 
208
                          "/dev/null", self.tree_1, 
209
                          "new_label", self.file_2b, self.tree_2,
210
                          output)
1558.15.11 by Aaron Bentley
Apply merge review suggestions
211
        self.assertEqual(output.getvalue(), 
212
                         "Binary files /dev/null and new_label differ\n")
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
213
    def test_link_diff_deleted(self):
1431 by Robert Collins
BUGFIX: disable symlink support tests when no symlink support is present on the system.
214
        if not has_symlinks():
215
            return
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
216
        output = StringIO()
217
        self.link_1.diff(internal_diff, 
218
                          "old_label", self.tree_1,
219
                          "/dev/null", None, None,
220
                          output)
221
        self.assertEqual(output.getvalue(),
222
                         "=== target was 'target1'\n")
223
224
    def test_link_diff_added(self):
1431 by Robert Collins
BUGFIX: disable symlink support tests when no symlink support is present on the system.
225
        if not has_symlinks():
226
            return
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
227
        output = StringIO()
228
        self.link_1.diff(internal_diff, 
229
                          "new_label", self.tree_1,
230
                          "/dev/null", None, None,
231
                          output, reverse=True)
232
        self.assertEqual(output.getvalue(),
233
                         "=== target is 'target1'\n")
234
235
    def test_link_diff_changed(self):
1431 by Robert Collins
BUGFIX: disable symlink support tests when no symlink support is present on the system.
236
        if not has_symlinks():
237
            return
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
238
        output = StringIO()
239
        self.link_1.diff(internal_diff, 
240
                          "/dev/null", self.tree_1, 
241
                          "new_label", self.link_2, self.tree_2,
242
                          output)
243
        self.assertEqual(output.getvalue(),
244
                         "=== target changed 'target1' => 'target2'\n")
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
245
246
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
247
class TestSnapshot(TestCaseWithTransport):
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
248
249
    def setUp(self):
250
        # for full testing we'll need a branch
251
        # with a subdir to test parent changes.
252
        # and a file, link and dir under that.
253
        # but right now I only need one attribute
254
        # to change, and then test merge patterns
255
        # with fake parent entries.
256
        super(TestSnapshot, self).setUp()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
257
        self.wt = self.make_branch_and_tree('.')
258
        self.branch = self.wt.branch
1185.38.7 by John Arbash Meinel
Updated build_tree to use fixed line-endings for tests which read the file contents and compare
259
        self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
260
        self.wt.add(['subdir', 'subdir/file'],
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
261
                                       ['dirid', 'fileid'])
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
262
        if has_symlinks():
263
            pass
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
264
        self.wt.commit('message_1', rev_id = '1')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
265
        self.tree_1 = self.branch.repository.revision_tree('1')
266
        self.inv_1 = self.branch.repository.get_inventory('1')
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
267
        self.file_1 = self.inv_1['fileid']
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
268
        self.file_active = self.wt.inventory['fileid']
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
269
270
    def test_snapshot_new_revision(self):
271
        # This tests that a simple commit with no parents makes a new
272
        # revision value in the inventory entry
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
273
        self.file_active.snapshot('2', 'subdir/file', {}, self.wt, 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
274
                                  self.branch.repository.weave_store,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
275
                                  self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
276
        # expected outcome - file_1 has a revision id of '2', and we can get
277
        # its text of 'file contents' out of the weave.
278
        self.assertEqual(self.file_1.revision, '1')
279
        self.assertEqual(self.file_active.revision, '2')
280
        # this should be a separate test probably, but lets check it once..
1563.2.30 by Robert Collins
Remove all but fetch references to revision_store, making the repository references that are weave specific use the RevisionTextStore.text_store attribute.
281
        lines = self.branch.repository.weave_store.get_weave(
282
            'fileid', 
283
            self.branch.get_transaction()).get_lines('2')
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
284
        self.assertEqual(lines, ['contents of subdir/file\n'])
285
286
    def test_snapshot_unchanged(self):
287
        #This tests that a simple commit does not make a new entry for
288
        # an unchanged inventory entry
289
        self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
1534.4.28 by Robert Collins
first cut at merge from integration.
290
                                  self.wt, 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
291
                                  self.branch.repository.weave_store,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
292
                                  self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
293
        self.assertEqual(self.file_1.revision, '1')
294
        self.assertEqual(self.file_active.revision, '1')
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
295
        vf = self.branch.repository.weave_store.get_weave(
296
            'fileid', 
297
            self.branch.repository.get_transaction())
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
298
        self.assertRaises(errors.RevisionNotPresent,
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
299
                          vf.get_lines,
300
                          '2')
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
301
302
    def test_snapshot_merge_identical_different_revid(self):
303
        # This tests that a commit with two identical parents, one of which has
304
        # a different revision id, results in a new revision id in the entry.
1408 by Robert Collins
we do not need revision_trees in commit, parent inventories are sufficient
305
        # 1->other, commit a merge of other against 1, results in 2.
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
306
        other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
307
        other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
308
        other_ie.revision = '1'
309
        other_ie.text_sha1 = self.file_1.text_sha1
310
        other_ie.text_size = self.file_1.text_size
311
        self.assertEqual(self.file_1, other_ie)
312
        other_ie.revision = 'other'
313
        self.assertNotEqual(self.file_1, other_ie)
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
314
        versionfile = self.branch.repository.weave_store.get_weave(
315
            'fileid', self.branch.repository.get_transaction())
316
        versionfile.clone_text('other', '1', ['1'])
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
317
        self.file_active.snapshot('2', 'subdir/file', 
318
                                  {'1':self.file_1, 'other':other_ie},
1534.4.28 by Robert Collins
first cut at merge from integration.
319
                                  self.wt, 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
320
                                  self.branch.repository.weave_store,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
321
                                  self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
322
        self.assertEqual(self.file_active.revision, '2')
323
324
    def test_snapshot_changed(self):
325
        # This tests that a commit with one different parent results in a new
326
        # revision id in the entry.
327
        self.file_active.name='newname'
328
        rename('subdir/file', 'subdir/newname')
329
        self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1}, 
1534.4.28 by Robert Collins
first cut at merge from integration.
330
                                  self.wt,
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
331
                                  self.branch.repository.weave_store,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
332
                                  self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
333
        # expected outcome - file_1 has a revision id of '2'
334
        self.assertEqual(self.file_active.revision, '2')
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
335
336
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
337
class TestPreviousHeads(TestCaseWithTransport):
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
338
339
    def setUp(self):
340
        # we want several inventories, that respectively
341
        # give use the following scenarios:
342
        # A) fileid not in any inventory (A),
343
        # B) fileid present in one inventory (B) and (A,B)
344
        # C) fileid present in two inventories, and they
345
        #   are not mutual descendents (B, C)
346
        # D) fileid present in two inventories and one is
347
        #   a descendent of the other. (B, D)
348
        super(TestPreviousHeads, self).setUp()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
349
        self.wt = self.make_branch_and_tree('.')
350
        self.branch = self.wt.branch
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
351
        self.build_tree(['file'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
352
        self.wt.commit('new branch', allow_pointless=True, rev_id='A')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
353
        self.inv_A = self.branch.repository.get_inventory('A')
1185.65.13 by Robert Collins
Merge from integration
354
        self.wt.add(['file'], ['fileid'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
355
        self.wt.commit('add file', rev_id='B')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
356
        self.inv_B = self.branch.repository.get_inventory('B')
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
357
        uncommit(self.branch, tree=self.wt)
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
358
        self.assertEqual(self.branch.revision_history(), ['A'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
359
        self.wt.commit('another add of file', rev_id='C')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
360
        self.inv_C = self.branch.repository.get_inventory('C')
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
361
        self.wt.add_pending_merge('B')
362
        self.wt.commit('merge in B', rev_id='D')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
363
        self.inv_D = self.branch.repository.get_inventory('D')
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
364
        self.file_active = self.wt.inventory['fileid']
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
365
        self.weave = self.branch.repository.weave_store.get_weave('fileid',
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
366
            self.branch.repository.get_transaction())
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
367
        
368
    def get_previous_heads(self, inventories):
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
369
        return self.file_active.find_previous_heads(
370
            inventories, 
371
            self.branch.repository.weave_store,
372
            self.branch.repository.get_transaction())
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
373
        
374
    def test_fileid_in_no_inventory(self):
375
        self.assertEqual({}, self.get_previous_heads([self.inv_A]))
376
377
    def test_fileid_in_one_inventory(self):
378
        self.assertEqual({'B':self.inv_B['fileid']},
379
                         self.get_previous_heads([self.inv_B]))
380
        self.assertEqual({'B':self.inv_B['fileid']},
381
                         self.get_previous_heads([self.inv_A, self.inv_B]))
382
        self.assertEqual({'B':self.inv_B['fileid']},
383
                         self.get_previous_heads([self.inv_B, self.inv_A]))
384
385
    def test_fileid_in_two_inventories_gives_both_entries(self):
386
        self.assertEqual({'B':self.inv_B['fileid'],
387
                          'C':self.inv_C['fileid']},
388
                          self.get_previous_heads([self.inv_B, self.inv_C]))
389
        self.assertEqual({'B':self.inv_B['fileid'],
390
                          'C':self.inv_C['fileid']},
391
                          self.get_previous_heads([self.inv_C, self.inv_B]))
392
393
    def test_fileid_in_two_inventories_already_merged_gives_head(self):
394
        self.assertEqual({'D':self.inv_D['fileid']},
395
                         self.get_previous_heads([self.inv_B, self.inv_D]))
396
        self.assertEqual({'D':self.inv_D['fileid']},
397
                         self.get_previous_heads([self.inv_D, self.inv_B]))
398
399
    # TODO: test two inventories with the same file revision 
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
400
401
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
402
class TestExecutable(TestCaseWithTransport):
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
403
404
    def test_stays_executable(self):
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
405
        a_id = "a-20051208024829-849e76f7968d7a86"
406
        b_id = "b-20051208024829-849e76f7968d7a86"
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
407
        wt = self.make_branch_and_tree('b1')
408
        b = wt.branch
1551.2.54 by abentley
Fixed executability test
409
        tt = TreeTransform(wt)
410
        tt.new_file('a', tt.root, 'a test\n', a_id, True)
411
        tt.new_file('b', tt.root, 'b test\n', b_id, False)
412
        tt.apply()
413
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
414
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
415
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
416
        # reopen the tree and ensure it stuck.
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
417
        wt = wt.bzrdir.open_workingtree()
418
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
419
420
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
421
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
422
423
        wt.commit('adding a,b', rev_id='r1')
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
424
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
425
        rev_tree = b.repository.revision_tree('r1')
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
426
        self.failUnless(rev_tree.is_executable(a_id), "'a' lost the execute bit")
427
        self.failIf(rev_tree.is_executable(b_id), "'b' gained an execute bit")
428
429
        self.failUnless(rev_tree.inventory[a_id].executable)
430
        self.failIf(rev_tree.inventory[b_id].executable)
431
432
        # Make sure the entries are gone
433
        os.remove('b1/a')
434
        os.remove('b1/b')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
435
        self.failIf(wt.has_id(a_id))
436
        self.failIf(wt.has_filename('a'))
437
        self.failIf(wt.has_id(b_id))
438
        self.failIf(wt.has_filename('b'))
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
439
440
        # Make sure that revert is able to bring them back,
441
        # and sets 'a' back to being executable
442
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
443
        wt.revert(['a', 'b'], rev_tree, backups=False)
444
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
445
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
446
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
447
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
448
449
        # Now remove them again, and make sure that after a
450
        # commit, they are still marked correctly
451
        os.remove('b1/a')
452
        os.remove('b1/b')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
453
        wt.commit('removed', rev_id='r2')
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
454
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
455
        self.assertEqual([], [cn for cn,ie in wt.inventory.iter_entries()])
456
        self.failIf(wt.has_id(a_id))
457
        self.failIf(wt.has_filename('a'))
458
        self.failIf(wt.has_id(b_id))
459
        self.failIf(wt.has_filename('b'))
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
460
461
        # Now revert back to the previous commit
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
462
        wt.revert([], rev_tree, backups=False)
463
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
464
465
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
466
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
467
468
        # Now make sure that 'bzr branch' also preserves the
469
        # executable bit
470
        # TODO: Maybe this should be a blackbox test
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
471
        d2 = b.bzrdir.clone('b2', revision_id='r1')
472
        t2 = d2.open_workingtree()
473
        b2 = t2.branch
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
474
        self.assertEquals('r1', b2.last_revision())
475
476
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
477
        self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
478
        self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
479
480
        # Make sure pull will delete the files
481
        t2.pull(b)
482
        self.assertEquals('r2', b2.last_revision())
483
        self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
484
485
        # Now commit the changes on the first branch
486
        # so that the second branch can pull the changes
487
        # and make sure that the executable bit has been copied
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
488
        wt.commit('resurrected', rev_id='r3')
1185.31.55 by John Arbash Meinel
Added (win32 failing) test to make sure is_executable is maintained over several operations
489
490
        t2.pull(b)
491
        self.assertEquals('r3', b2.last_revision())
492
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
493
494
        self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
495
        self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
1534.7.178 by Aaron Bentley
Fixed dangling inventory ids in revert
496
497
class TestRevert(TestCaseWithTransport):
498
    def test_dangling_id(self):
499
        wt = self.make_branch_and_tree('b1')
500
        self.assertEqual(len(wt.inventory), 1)
501
        open('b1/a', 'wb').write('a test\n')
502
        wt.add('a')
503
        self.assertEqual(len(wt.inventory), 2)
504
        os.unlink('b1/a')
505
        wt.revert([])
506
        self.assertEqual(len(wt.inventory), 1)
1534.7.193 by Aaron Bentley
Stopped revert from preserving file contents produced by merges
507
508