/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.82.7 by John Arbash Meinel
Adding patches.py into bzrlib, including the tests into the test suite.
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.82.7 by John Arbash Meinel
Adding patches.py into bzrlib, including the tests into the test suite.
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.82.7 by John Arbash Meinel
Adding patches.py into bzrlib, including the tests into the test suite.
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
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
16
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
17
from cStringIO import StringIO
1711.7.27 by John Arbash Meinel
Investigating why test_bundle fails, something isn't transmitting properly.
18
import os
1711.7.34 by John Arbash Meinel
Include a test to ensure bundles handle trailing whitespace.
19
import sys
1711.7.27 by John Arbash Meinel
Investigating why test_bundle fails, something isn't transmitting properly.
20
import tempfile
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
21
1910.2.64 by Aaron Bentley
Changes from review
22
from bzrlib import (
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
23
    bzrdir,
24
    errors,
25
    inventory,
26
    repository,
1910.2.64 by Aaron Bentley
Changes from review
27
    treebuilder,
28
    )
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
29
from bzrlib.builtins import _merge_helper
1185.82.40 by Aaron Bentley
Started work on testing install_revisions/handling empty changesets
30
from bzrlib.bzrdir import BzrDir
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
31
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
1793.2.3 by Aaron Bentley
Rename read_bundle.py to bundle_data.py
32
from bzrlib.bundle.bundle_data import BundleTree
2520.4.72 by Aaron Bentley
Rename format to 4alpha
33
from bzrlib.bundle.serializer import write_bundle, read_bundle, v4
1910.2.49 by Aaron Bentley
Ensure that 0.8 bundles aren't used with KnitRepository2
34
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
35
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
2520.4.72 by Aaron Bentley
Rename format to 4alpha
36
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
1711.7.27 by John Arbash Meinel
Investigating why test_bundle fails, something isn't transmitting properly.
37
from bzrlib.branch import Branch
1185.82.90 by Aaron Bentley
Reorganized test suite
38
from bzrlib.diff import internal_diff
1910.2.3 by Aaron Bentley
All tests pass
39
from bzrlib.errors import (BzrError, TestamentMismatch, NotABundle, BadBundle, 
40
                           NoSuchFile,)
1185.82.44 by Aaron Bentley
Switch to merge_changeset in test suite
41
from bzrlib.merge import Merge3Merger
2241.1.5 by Martin Pool
Move KnitFormat2 into repofmt
42
from bzrlib.repofmt import knitrepo
1185.82.87 by Aaron Bentley
Got symlink adding working
43
from bzrlib.osutils import has_symlinks, sha_file
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
44
from bzrlib.tests import (TestCaseInTempDir, TestCaseWithTransport,
2520.4.34 by Aaron Bentley
Add signature support
45
                          TestCase, TestSkipped, test_commit)
1185.82.66 by Aaron Bentley
Handle new executable files
46
from bzrlib.transform import TreeTransform
1185.82.17 by Aaron Bentley
More API updates
47
from bzrlib.workingtree import WorkingTree
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
48
1185.82.90 by Aaron Bentley
Reorganized test suite
49
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
50
class MockTree(object):
51
    def __init__(self):
1731.1.4 by Aaron Bentley
merge from bzr.dev
52
        from bzrlib.inventory import InventoryDirectory, ROOT_ID
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
53
        object.__init__(self)
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
54
        self.paths = {ROOT_ID: ""}
55
        self.ids = {"": ROOT_ID}
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
56
        self.contents = {}
1731.1.4 by Aaron Bentley
merge from bzr.dev
57
        self.root = InventoryDirectory(ROOT_ID, '', None)
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
58
59
    inventory = property(lambda x:x)
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
60
61
    def __iter__(self):
62
        return self.paths.iterkeys()
63
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
64
    def __getitem__(self, file_id):
65
        if file_id == self.root.file_id:
66
            return self.root
67
        else:
68
            return self.make_entry(file_id, self.paths[file_id])
69
70
    def parent_id(self, file_id):
1711.7.27 by John Arbash Meinel
Investigating why test_bundle fails, something isn't transmitting properly.
71
        parent_dir = os.path.dirname(self.paths[file_id])
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
72
        if parent_dir == "":
73
            return None
74
        return self.ids[parent_dir]
75
76
    def iter_entries(self):
77
        for path, file_id in self.ids.iteritems():
78
            yield path, self[file_id]
79
80
    def get_file_kind(self, file_id):
81
        if file_id in self.contents:
82
            kind = 'file'
83
        else:
84
            kind = 'directory'
85
        return kind
86
87
    def make_entry(self, file_id, path):
0.5.119 by John Arbash Meinel
Recreated the factory. We really need InventoryEntry.create()
88
        from bzrlib.inventory import (InventoryEntry, InventoryFile
89
                                    , InventoryDirectory, InventoryLink)
1711.7.27 by John Arbash Meinel
Investigating why test_bundle fails, something isn't transmitting properly.
90
        name = os.path.basename(path)
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
91
        kind = self.get_file_kind(file_id)
92
        parent_id = self.parent_id(file_id)
93
        text_sha_1, text_size = self.contents_stats(file_id)
0.5.119 by John Arbash Meinel
Recreated the factory. We really need InventoryEntry.create()
94
        if kind == 'directory':
95
            ie = InventoryDirectory(file_id, name, parent_id)
96
        elif kind == 'file':
97
            ie = InventoryFile(file_id, name, parent_id)
98
        elif kind == 'symlink':
99
            ie = InventoryLink(file_id, name, parent_id)
100
        else:
101
            raise BzrError('unknown kind %r' % kind)
0.5.91 by Aaron Bentley
Updated to match API change
102
        ie.text_sha1 = text_sha_1
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
103
        ie.text_size = text_size
104
        return ie
105
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
106
    def add_dir(self, file_id, path):
107
        self.paths[file_id] = path
108
        self.ids[path] = file_id
109
    
110
    def add_file(self, file_id, path, contents):
111
        self.add_dir(file_id, path)
112
        self.contents[file_id] = contents
113
114
    def path2id(self, path):
115
        return self.ids.get(path)
116
117
    def id2path(self, file_id):
118
        return self.paths.get(file_id)
119
120
    def has_id(self, file_id):
121
        return self.id2path(file_id) is not None
122
123
    def get_file(self, file_id):
124
        result = StringIO()
125
        result.write(self.contents[file_id])
126
        result.seek(0,0)
127
        return result
128
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
129
    def contents_stats(self, file_id):
130
        if file_id not in self.contents:
131
            return None, None
132
        text_sha1 = sha_file(self.get_file(file_id))
133
        return text_sha1, len(self.contents[file_id])
134
135
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
136
class BTreeTester(TestCase):
137
    """A simple unittest tester for the BundleTree class."""
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
138
139
    def make_tree_1(self):
140
        mtree = MockTree()
141
        mtree.add_dir("a", "grandparent")
142
        mtree.add_dir("b", "grandparent/parent")
143
        mtree.add_file("c", "grandparent/parent/file", "Hello\n")
144
        mtree.add_dir("d", "grandparent/alt_parent")
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
145
        return BundleTree(mtree, ''), mtree
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
146
        
147
    def test_renames(self):
148
        """Ensure that file renames have the proper effect on children"""
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
149
        btree = self.make_tree_1()[0]
150
        self.assertEqual(btree.old_path("grandparent"), "grandparent")
151
        self.assertEqual(btree.old_path("grandparent/parent"), 
152
                         "grandparent/parent")
153
        self.assertEqual(btree.old_path("grandparent/parent/file"),
154
                         "grandparent/parent/file")
155
156
        self.assertEqual(btree.id2path("a"), "grandparent")
157
        self.assertEqual(btree.id2path("b"), "grandparent/parent")
158
        self.assertEqual(btree.id2path("c"), "grandparent/parent/file")
159
160
        self.assertEqual(btree.path2id("grandparent"), "a")
161
        self.assertEqual(btree.path2id("grandparent/parent"), "b")
162
        self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
163
164
        assert btree.path2id("grandparent2") is None
165
        assert btree.path2id("grandparent2/parent") is None
166
        assert btree.path2id("grandparent2/parent/file") is None
167
168
        btree.note_rename("grandparent", "grandparent2")
169
        assert btree.old_path("grandparent") is None
170
        assert btree.old_path("grandparent/parent") is None
171
        assert btree.old_path("grandparent/parent/file") is None
172
173
        self.assertEqual(btree.id2path("a"), "grandparent2")
174
        self.assertEqual(btree.id2path("b"), "grandparent2/parent")
175
        self.assertEqual(btree.id2path("c"), "grandparent2/parent/file")
176
177
        self.assertEqual(btree.path2id("grandparent2"), "a")
178
        self.assertEqual(btree.path2id("grandparent2/parent"), "b")
179
        self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
180
181
        assert btree.path2id("grandparent") is None
182
        assert btree.path2id("grandparent/parent") is None
183
        assert btree.path2id("grandparent/parent/file") is None
184
185
        btree.note_rename("grandparent/parent", "grandparent2/parent2")
186
        self.assertEqual(btree.id2path("a"), "grandparent2")
187
        self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
188
        self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file")
189
190
        self.assertEqual(btree.path2id("grandparent2"), "a")
191
        self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
192
        self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
193
194
        assert btree.path2id("grandparent2/parent") is None
195
        assert btree.path2id("grandparent2/parent/file") is None
196
197
        btree.note_rename("grandparent/parent/file", 
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
198
                          "grandparent2/parent2/file2")
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
199
        self.assertEqual(btree.id2path("a"), "grandparent2")
200
        self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
201
        self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file2")
202
203
        self.assertEqual(btree.path2id("grandparent2"), "a")
204
        self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
205
        self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
206
207
        assert btree.path2id("grandparent2/parent2/file") is None
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
208
209
    def test_moves(self):
210
        """Ensure that file moves have the proper effect on children"""
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
211
        btree = self.make_tree_1()[0]
212
        btree.note_rename("grandparent/parent/file", 
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
213
                          "grandparent/alt_parent/file")
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
214
        self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
215
        self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
216
        assert btree.path2id("grandparent/parent/file") is None
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
217
218
    def unified_diff(self, old, new):
219
        out = StringIO()
220
        internal_diff("old", old, "new", new, out)
221
        out.seek(0,0)
222
        return out.read()
223
224
    def make_tree_2(self):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
225
        btree = self.make_tree_1()[0]
226
        btree.note_rename("grandparent/parent/file", 
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
227
                          "grandparent/alt_parent/file")
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
228
        assert btree.id2path("e") is None
229
        assert btree.path2id("grandparent/parent/file") is None
230
        btree.note_id("e", "grandparent/parent/file")
231
        return btree
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
232
233
    def test_adds(self):
234
        """File/inventory adds"""
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
235
        btree = self.make_tree_2()
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
236
        add_patch = self.unified_diff([], ["Extra cheese\n"])
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
237
        btree.note_patch("grandparent/parent/file", add_patch)
238
        btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
239
        btree.note_target('grandparent/parent/symlink', 'venus')
240
        self.adds_test(btree)
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
241
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
242
    def adds_test(self, btree):
243
        self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
244
        self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
245
        self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
246
        self.assertEqual(btree.get_symlink_target('f'), 'venus')
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
247
248
    def test_adds2(self):
249
        """File/inventory adds, with patch-compatibile renames"""
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
250
        btree = self.make_tree_2()
251
        btree.contents_by_id = False
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
252
        add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
253
        btree.note_patch("grandparent/parent/file", add_patch)
254
        btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
255
        btree.note_target('grandparent/parent/symlink', 'venus')
256
        self.adds_test(btree)
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
257
258
    def make_tree_3(self):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
259
        btree, mtree = self.make_tree_1()
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
260
        mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
261
        btree.note_rename("grandparent/parent/file", 
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
262
                          "grandparent/alt_parent/file")
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
263
        btree.note_rename("grandparent/parent/topping", 
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
264
                          "grandparent/alt_parent/stopping")
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
265
        return btree
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
266
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
267
    def get_file_test(self, btree):
268
        self.assertEqual(btree.get_file("e").read(), "Lemon\n")
269
        self.assertEqual(btree.get_file("c").read(), "Hello\n")
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
270
271
    def test_get_file(self):
272
        """Get file contents"""
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
273
        btree = self.make_tree_3()
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
274
        mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
275
        btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
276
        self.get_file_test(btree)
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
277
278
    def test_get_file2(self):
279
        """Get file contents, with patch-compatibile renames"""
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
280
        btree = self.make_tree_3()
281
        btree.contents_by_id = False
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
282
        mod_patch = self.unified_diff([], ["Lemon\n"])
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
283
        btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
284
        mod_patch = self.unified_diff([], ["Hello\n"])
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
285
        btree.note_patch("grandparent/alt_parent/file", mod_patch)
286
        self.get_file_test(btree)
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
287
288
    def test_delete(self):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
289
        "Deletion by bundle"
290
        btree = self.make_tree_1()[0]
291
        self.assertEqual(btree.get_file("c").read(), "Hello\n")
292
        btree.note_deletion("grandparent/parent/file")
293
        assert btree.id2path("c") is None
294
        assert btree.path2id("grandparent/parent/file") is None
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
295
296
    def sorted_ids(self, tree):
297
        ids = list(tree)
298
        ids.sort()
299
        return ids
300
301
    def test_iteration(self):
302
        """Ensure that iteration through ids works properly"""
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
303
        btree = self.make_tree_1()[0]
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
304
        self.assertEqual(self.sorted_ids(btree),
305
            [inventory.ROOT_ID, 'a', 'b', 'c', 'd'])
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
306
        btree.note_deletion("grandparent/parent/file")
307
        btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
308
        btree.note_last_changed("grandparent/alt_parent/fool", 
1185.82.95 by Aaron Bentley
Restore path-orientation of ChangesetTree
309
                                "revisionidiguess")
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
310
        self.assertEqual(self.sorted_ids(btree),
311
            [inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
312
1185.82.7 by John Arbash Meinel
Adding patches.py into bzrlib, including the tests into the test suite.
313
1910.2.49 by Aaron Bentley
Ensure that 0.8 bundles aren't used with KnitRepository2
314
class BundleTester1(TestCaseWithTransport):
315
316
    def test_mismatched_bundle(self):
317
        format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
318
        format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.49 by Aaron Bentley
Ensure that 0.8 bundles aren't used with KnitRepository2
319
        serializer = BundleSerializerV08('0.8')
320
        b = self.make_branch('.', format=format)
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
321
        self.assertRaises(errors.IncompatibleBundleFormat, serializer.write, 
1910.2.49 by Aaron Bentley
Ensure that 0.8 bundles aren't used with KnitRepository2
322
                          b.repository, [], {}, StringIO())
323
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
324
    def test_matched_bundle(self):
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
325
        """Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
326
        format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
327
        format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
328
        serializer = BundleSerializerV09('0.9')
329
        b = self.make_branch('.', format=format)
330
        serializer.write(b.repository, [], {}, StringIO())
331
1910.2.60 by Aaron Bentley
Ensure that new-model revisions aren't installed into old-model repos
332
    def test_mismatched_model(self):
333
        """Try copying a bundle from knit2 to knit1"""
334
        format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
335
        format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.60 by Aaron Bentley
Ensure that new-model revisions aren't installed into old-model repos
336
        source = self.make_branch_and_tree('source', format=format)
337
        source.commit('one', rev_id='one-id')
338
        source.commit('two', rev_id='two-id')
339
        text = StringIO()
340
        write_bundle(source.branch.repository, 'two-id', None, text, 
341
                     format='0.9')
342
        text.seek(0)
343
344
        format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
345
        format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.60 by Aaron Bentley
Ensure that new-model revisions aren't installed into old-model repos
346
        target = self.make_branch('target', format=format)
347
        self.assertRaises(errors.IncompatibleRevision, install_bundle, 
348
                          target.repository, read_bundle(text))
349
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
350
2520.4.43 by Aaron Bentley
Fix test suite
351
class BundleTester(object):
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
352
353
    def bzrdir_format(self):
354
        format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
355
        format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
356
        return format
357
358
    def make_branch_and_tree(self, path, format=None):
359
        if format is None:
360
            format = self.bzrdir_format()
361
        return TestCaseWithTransport.make_branch_and_tree(self, path, format)
362
363
    def make_branch(self, path, format=None):
364
        if format is None:
365
            format = self.bzrdir_format()
366
        return TestCaseWithTransport.make_branch(self, path, format)
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
367
1793.3.1 by John Arbash Meinel
Clean up the bundle tests a little bit.
368
    def create_bundle_text(self, base_rev_id, rev_id):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
369
        bundle_txt = StringIO()
370
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id, 
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
371
                               bundle_txt, format=self.format)
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
372
        bundle_txt.seek(0)
373
        self.assertEqual(bundle_txt.readline(), 
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
374
                         '# Bazaar revision bundle v%s\n' % self.format)
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
375
        self.assertEqual(bundle_txt.readline(), '#\n')
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
376
1185.82.14 by Aaron Bentley
API updates
377
        rev = self.b1.repository.get_revision(rev_id)
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
378
        self.assertEqual(bundle_txt.readline().decode('utf-8'),
379
                         u'# message:\n')
380
        bundle_txt.seek(0)
1793.3.1 by John Arbash Meinel
Clean up the bundle tests a little bit.
381
        return bundle_txt, rev_ids
382
383
    def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
384
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
385
        Make sure that the text generated is valid, and that it
386
        can be applied against the base, and generate the same information.
387
        
388
        :return: The in-memory bundle 
389
        """
390
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
391
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
392
        # This should also validate the generated bundle 
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
393
        bundle = read_bundle(bundle_txt)
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
394
        repository = self.b1.repository
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
395
        for bundle_rev in bundle.real_revisions:
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
396
            # These really should have already been checked when we read the
397
            # bundle, since it computes the sha1 hash for the revision, which
398
            # only will match if everything is okay, but lets be explicit about
399
            # it
400
            branch_rev = repository.get_revision(bundle_rev.revision_id)
1185.82.33 by Aaron Bentley
Strengthen tests
401
            for a in ('inventory_sha1', 'revision_id', 'parent_ids',
402
                      'timestamp', 'timezone', 'message', 'committer', 
403
                      'parent_ids', 'properties'):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
404
                self.assertEqual(getattr(branch_rev, a), 
405
                                 getattr(bundle_rev, a))
406
            self.assertEqual(len(branch_rev.parent_ids), 
407
                             len(bundle_rev.parent_ids))
1185.82.47 by Aaron Bentley
Ensure all intended rev_ids end up in the revision
408
        self.assertEqual(rev_ids, 
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
409
                         [r.revision_id for r in bundle.real_revisions])
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
410
        self.valid_apply_bundle(base_rev_id, bundle,
1185.82.89 by Aaron Bentley
Remove auto_commit stuff
411
                                   checkout_dir=checkout_dir)
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
412
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
413
        return bundle
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
414
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
415
    def get_invalid_bundle(self, base_rev_id, rev_id):
416
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
1185.82.118 by Aaron Bentley
Ensure that StrictTestament handles execute bit differences
417
        Munge the text so that it's invalid.
418
        
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
419
        :return: The in-memory bundle
1185.82.118 by Aaron Bentley
Ensure that StrictTestament handles execute bit differences
420
        """
1793.3.1 by John Arbash Meinel
Clean up the bundle tests a little bit.
421
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
422
        new_text = bundle_txt.getvalue().replace('executable:no', 
1185.82.118 by Aaron Bentley
Ensure that StrictTestament handles execute bit differences
423
                                               'executable:yes')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
424
        bundle_txt = StringIO(new_text)
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
425
        bundle = read_bundle(bundle_txt)
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
426
        self.valid_apply_bundle(base_rev_id, bundle)
427
        return bundle 
1185.82.118 by Aaron Bentley
Ensure that StrictTestament handles execute bit differences
428
1185.82.139 by Aaron Bentley
Raise NotABundle when a non-bundle is supplied
429
    def test_non_bundle(self):
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
430
        self.assertRaises(NotABundle, read_bundle, StringIO('#!/bin/sh\n'))
1185.82.139 by Aaron Bentley
Raise NotABundle when a non-bundle is supplied
431
1793.2.7 by Aaron Bentley
Fix reporting of malformed, (especially, crlf) bundles
432
    def test_malformed(self):
433
        self.assertRaises(BadBundle, read_bundle, 
434
                          StringIO('# Bazaar revision bundle v'))
435
436
    def test_crlf_bundle(self):
1793.2.9 by Aaron Bentley
Don't use assertNotRaises-- instead, catch BadBundle and pass
437
        try:
1793.3.14 by John Arbash Meinel
Actually fix the bug with missing trailing newline bug #49182
438
            read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
1793.2.9 by Aaron Bentley
Don't use assertNotRaises-- instead, catch BadBundle and pass
439
        except BadBundle:
440
            # It is currently permitted for bundles with crlf line endings to
441
            # make read_bundle raise a BadBundle, but this should be fixed.
1793.2.10 by Aaron Bentley
Whitespace/comment fix
442
            # Anything else, especially NotABundle, is an error.
1793.2.9 by Aaron Bentley
Don't use assertNotRaises-- instead, catch BadBundle and pass
443
            pass
444
0.5.88 by John Arbash Meinel
Fixed a bug in the rename code, added more tests.
445
    def get_checkout(self, rev_id, checkout_dir=None):
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
446
        """Get a new tree, with the specified revision in it.
447
        """
448
0.5.88 by John Arbash Meinel
Fixed a bug in the rename code, added more tests.
449
        if checkout_dir is None:
450
            checkout_dir = tempfile.mkdtemp(prefix='test-branch-', dir='.')
0.5.89 by John Arbash Meinel
Updating for explicitly defined directories.
451
        else:
452
            if not os.path.exists(checkout_dir):
453
                os.mkdir(checkout_dir)
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
454
        tree = self.make_branch_and_tree(checkout_dir)
1185.82.40 by Aaron Bentley
Started work on testing install_revisions/handling empty changesets
455
        s = StringIO()
1910.2.64 by Aaron Bentley
Changes from review
456
        ancestors = write_bundle(self.b1.repository, rev_id, None, s,
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
457
                                 format=self.format)
1185.82.40 by Aaron Bentley
Started work on testing install_revisions/handling empty changesets
458
        s.seek(0)
1185.82.135 by Aaron Bentley
Ensure that bundles are bytestrings
459
        assert isinstance(s.getvalue(), str), (
460
            "Bundle isn't a bytestring:\n %s..." % repr(s.getvalue())[:40])
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
461
        install_bundle(tree.branch.repository, read_bundle(s))
1185.82.41 by Aaron Bentley
More work on installing changesets
462
        for ancestor in ancestors:
463
            old = self.b1.repository.revision_tree(ancestor)
464
            new = tree.branch.repository.revision_tree(ancestor)
1711.7.27 by John Arbash Meinel
Investigating why test_bundle fails, something isn't transmitting properly.
465
466
            # Check that there aren't any inventory level changes
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
467
            delta = new.changes_from(old)
1711.7.32 by John Arbash Meinel
Switch from a trailing space to a beginning space, which is supported everywhere.
468
            self.assertFalse(delta.has_changed(),
469
                             'Revision %s not copied correctly.'
470
                             % (ancestor,))
1711.7.27 by John Arbash Meinel
Investigating why test_bundle fails, something isn't transmitting properly.
471
472
            # Now check that the file contents are all correct
1185.82.41 by Aaron Bentley
More work on installing changesets
473
            for inventory_id in old:
474
                try:
475
                    old_file = old.get_file(inventory_id)
1910.2.3 by Aaron Bentley
All tests pass
476
                except NoSuchFile:
1185.82.41 by Aaron Bentley
More work on installing changesets
477
                    continue
478
                if old_file is None:
479
                    continue
480
                self.assertEqual(old_file.read(),
481
                                 new.get_file(inventory_id).read())
1185.82.44 by Aaron Bentley
Switch to merge_changeset in test suite
482
        if rev_id is not None:
483
            rh = self.b1.revision_history()
484
            tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
485
            tree.update()
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
486
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
1711.7.32 by John Arbash Meinel
Switch from a trailing space to a beginning space, which is supported everywhere.
487
            self.assertFalse(delta.has_changed(),
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
488
                             'Working tree has modifications: %s' % delta)
1185.82.40 by Aaron Bentley
Started work on testing install_revisions/handling empty changesets
489
        return tree
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
490
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
491
    def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
492
        """Get the base revision, apply the changes, and make
493
        sure everything matches the builtin branch.
494
        """
1185.82.17 by Aaron Bentley
More API updates
495
        to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
1908.6.4 by Robert Collins
Update to replaced parent checking api bzrlib/merge.py
496
        original_parents = to_tree.get_parent_ids()
1185.82.40 by Aaron Bentley
Started work on testing install_revisions/handling empty changesets
497
        repository = to_tree.branch.repository
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
498
        original_parents = to_tree.get_parent_ids()
1185.82.41 by Aaron Bentley
More work on installing changesets
499
        self.assertIs(repository.has_revision(base_rev_id), True)
1185.82.40 by Aaron Bentley
Started work on testing install_revisions/handling empty changesets
500
        for rev in info.real_revisions:
501
            self.assert_(not repository.has_revision(rev.revision_id),
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
502
                'Revision {%s} present before applying bundle' 
1185.82.40 by Aaron Bentley
Started work on testing install_revisions/handling empty changesets
503
                % rev.revision_id)
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
504
        merge_bundle(info, to_tree, True, Merge3Merger, False, False)
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
505
506
        for rev in info.real_revisions:
1185.82.17 by Aaron Bentley
More API updates
507
            self.assert_(repository.has_revision(rev.revision_id),
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
508
                'Missing revision {%s} after applying bundle' 
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
509
                % rev.revision_id)
510
1185.82.17 by Aaron Bentley
More API updates
511
        self.assert_(to_tree.branch.repository.has_revision(info.target))
0.5.117 by John Arbash Meinel
Almost there. Just need to track down a few remaining bugs.
512
        # Do we also want to verify that all the texts have been added?
0.5.86 by John Arbash Meinel
Updated the auto-commit functionality, and adding to pending-merges, more testing.
513
1908.6.4 by Robert Collins
Update to replaced parent checking api bzrlib/merge.py
514
        self.assertEqual(original_parents + [info.target],
515
            to_tree.get_parent_ids())
0.5.86 by John Arbash Meinel
Updated the auto-commit functionality, and adding to pending-merges, more testing.
516
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
517
        rev = info.real_revisions[-1]
1185.82.17 by Aaron Bentley
More API updates
518
        base_tree = self.b1.repository.revision_tree(rev.revision_id)
519
        to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
520
        
521
        # TODO: make sure the target tree is identical to base tree
0.5.86 by John Arbash Meinel
Updated the auto-commit functionality, and adding to pending-merges, more testing.
522
        #       we might also check the working tree.
523
524
        base_files = list(base_tree.list_files())
525
        to_files = list(to_tree.list_files())
526
        self.assertEqual(len(base_files), len(to_files))
1185.82.66 by Aaron Bentley
Handle new executable files
527
        for base_file, to_file in zip(base_files, to_files):
528
            self.assertEqual(base_file, to_file)
0.5.86 by John Arbash Meinel
Updated the auto-commit functionality, and adding to pending-merges, more testing.
529
0.5.117 by John Arbash Meinel
Almost there. Just need to track down a few remaining bugs.
530
        for path, status, kind, fileid, entry in base_files:
0.5.86 by John Arbash Meinel
Updated the auto-commit functionality, and adding to pending-merges, more testing.
531
            # Check that the meta information is the same
532
            self.assertEqual(base_tree.get_file_size(fileid),
533
                    to_tree.get_file_size(fileid))
534
            self.assertEqual(base_tree.get_file_sha1(fileid),
535
                    to_tree.get_file_sha1(fileid))
536
            # Check that the contents are the same
537
            # This is pretty expensive
538
            # self.assertEqual(base_tree.get_file(fileid).read(),
539
            #         to_tree.get_file(fileid).read())
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
540
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
541
    def test_bundle(self):
1711.7.34 by John Arbash Meinel
Include a test to ensure bundles handle trailing whitespace.
542
        self.tree1 = self.make_branch_and_tree('b1')
1185.82.14 by Aaron Bentley
API updates
543
        self.b1 = self.tree1.branch
0.5.78 by John Arbash Meinel
Working on test cases, starting with the empty project issues.
544
1793.3.1 by John Arbash Meinel
Clean up the bundle tests a little bit.
545
        open('b1/one', 'wb').write('one\n')
1185.82.14 by Aaron Bentley
API updates
546
        self.tree1.add('one')
547
        self.tree1.commit('add one', rev_id='a@cset-0-1')
0.5.78 by John Arbash Meinel
Working on test cases, starting with the empty project issues.
548
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
549
        bundle = self.get_valid_bundle(None, 'a@cset-0-1')
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
550
551
        # Make sure we can handle files with spaces, tabs, other
552
        # bogus characters
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
553
        self.build_tree([
0.5.84 by John Arbash Meinel
(broken) problem with removes.
554
                'b1/with space.txt'
555
                , 'b1/dir/'
556
                , 'b1/dir/filein subdir.c'
557
                , 'b1/dir/WithCaps.txt'
1711.7.32 by John Arbash Meinel
Switch from a trailing space to a beginning space, which is supported everywhere.
558
                , 'b1/dir/ pre space'
0.5.84 by John Arbash Meinel
(broken) problem with removes.
559
                , 'b1/sub/'
560
                , 'b1/sub/sub/'
561
                , 'b1/sub/sub/nonempty.txt'
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
562
                ])
0.5.84 by John Arbash Meinel
(broken) problem with removes.
563
        open('b1/sub/sub/emptyfile.txt', 'wb').close()
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
564
        open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
1185.82.66 by Aaron Bentley
Handle new executable files
565
        tt = TreeTransform(self.tree1)
566
        tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
567
        tt.apply()
1185.82.14 by Aaron Bentley
API updates
568
        self.tree1.add([
0.5.84 by John Arbash Meinel
(broken) problem with removes.
569
                'with space.txt'
570
                , 'dir'
571
                , 'dir/filein subdir.c'
572
                , 'dir/WithCaps.txt'
1711.7.32 by John Arbash Meinel
Switch from a trailing space to a beginning space, which is supported everywhere.
573
                , 'dir/ pre space'
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
574
                , 'dir/nolastnewline.txt'
0.5.84 by John Arbash Meinel
(broken) problem with removes.
575
                , 'sub'
576
                , 'sub/sub'
577
                , 'sub/sub/nonempty.txt'
578
                , 'sub/sub/emptyfile.txt'
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
579
                ])
1185.82.14 by Aaron Bentley
API updates
580
        self.tree1.commit('add whitespace', rev_id='a@cset-0-2')
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
581
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
582
        bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
0.5.117 by John Arbash Meinel
Almost there. Just need to track down a few remaining bugs.
583
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
584
        # Check a rollup bundle 
585
        bundle = self.get_valid_bundle(None, 'a@cset-0-2')
0.5.84 by John Arbash Meinel
(broken) problem with removes.
586
587
        # Now delete entries
1185.82.21 by Aaron Bentley
Stop using deprecated function
588
        self.tree1.remove(
0.5.118 by John Arbash Meinel
Got most of test_changeset to work. Still needs work for Aaron's test code.
589
                ['sub/sub/nonempty.txt'
0.5.84 by John Arbash Meinel
(broken) problem with removes.
590
                , 'sub/sub/emptyfile.txt'
0.5.118 by John Arbash Meinel
Got most of test_changeset to work. Still needs work for Aaron's test code.
591
                , 'sub/sub'
592
                ])
1185.82.68 by Aaron Bentley
Handle execute bit on modified files
593
        tt = TreeTransform(self.tree1)
594
        trans_id = tt.trans_id_tree_file_id('exe-1')
595
        tt.set_executability(False, trans_id)
596
        tt.apply()
1185.82.19 by Aaron Bentley
More API updates
597
        self.tree1.commit('removed', rev_id='a@cset-0-3')
0.5.80 by John Arbash Meinel
Starting to write tests for changeset, discovering some errors as I go.
598
        
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
599
        bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
2520.4.71 by Aaron Bentley
Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch
600
        self.assertRaises((TestamentMismatch,
601
            errors.VersionedFileInvalidChecksum), self.get_invalid_bundle,
602
            'a@cset-0-2', 'a@cset-0-3')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
603
        # Check a rollup bundle 
604
        bundle = self.get_valid_bundle(None, 'a@cset-0-3')
0.5.84 by John Arbash Meinel
(broken) problem with removes.
605
606
        # Now move the directory
1185.82.19 by Aaron Bentley
More API updates
607
        self.tree1.rename_one('dir', 'sub/dir')
608
        self.tree1.commit('rename dir', rev_id='a@cset-0-4')
0.5.84 by John Arbash Meinel
(broken) problem with removes.
609
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
610
        bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
611
        # Check a rollup bundle 
612
        bundle = self.get_valid_bundle(None, 'a@cset-0-4')
0.5.84 by John Arbash Meinel
(broken) problem with removes.
613
0.5.87 by John Arbash Meinel
Handling international characters, added more test cases.
614
        # Modified files
615
        open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
2520.4.83 by Aaron Bentley
Clean up tests
616
        open('b1/sub/dir/ pre space', 'ab').write(
617
             '\r\nAdding some\r\nDOS format lines\r\n')
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
618
        open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
1711.7.32 by John Arbash Meinel
Switch from a trailing space to a beginning space, which is supported everywhere.
619
        self.tree1.rename_one('sub/dir/ pre space', 
620
                              'sub/ start space')
1185.82.19 by Aaron Bentley
More API updates
621
        self.tree1.commit('Modified files', rev_id='a@cset-0-5')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
622
        bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
0.5.87 by John Arbash Meinel
Handling international characters, added more test cases.
623
1185.82.70 by Aaron Bentley
Handle renamed files better
624
        self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
625
        self.tree1.rename_one('with space.txt', 'WithCaps.txt')
626
        self.tree1.rename_one('temp', 'with space.txt')
1711.7.35 by John Arbash Meinel
Factor out i18n bundle tests, so we don't always skip.
627
        self.tree1.commit(u'swap filenames', rev_id='a@cset-0-6',
628
                          verbose=False)
629
        bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
630
        other = self.get_checkout('a@cset-0-5')
1910.2.62 by Aaron Bentley
Cleanups
631
        tree1_inv = self.tree1.branch.repository.get_inventory_xml(
632
            'a@cset-0-5')
1910.2.54 by Aaron Bentley
Implement testament format 3 strict
633
        tree2_inv = other.branch.repository.get_inventory_xml('a@cset-0-5')
634
        self.assertEqualDiff(tree1_inv, tree2_inv)
1711.7.35 by John Arbash Meinel
Factor out i18n bundle tests, so we don't always skip.
635
        other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
636
        other.commit('rename file', rev_id='a@cset-0-6b')
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
637
        _merge_helper([other.basedir, -1], [None, None],
638
                      this_dir=self.tree1.basedir)
1711.7.35 by John Arbash Meinel
Factor out i18n bundle tests, so we don't always skip.
639
        self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
1185.82.70 by Aaron Bentley
Handle renamed files better
640
                          verbose=False)
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
641
        bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
1185.82.72 by Aaron Bentley
Always use leftmost base for changesets
642
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
643
    def test_symlink_bundle(self):
1185.82.87 by Aaron Bentley
Got symlink adding working
644
        if not has_symlinks():
645
            raise TestSkipped("No symlink support")
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
646
        self.tree1 = self.make_branch_and_tree('b1')
1185.82.87 by Aaron Bentley
Got symlink adding working
647
        self.b1 = self.tree1.branch
648
        tt = TreeTransform(self.tree1)
1185.82.88 by Aaron Bentley
Get symlink modification, renames and deletion under test
649
        tt.new_symlink('link', tt.root, 'bar/foo', 'link-1')
1185.82.87 by Aaron Bentley
Got symlink adding working
650
        tt.apply()
651
        self.tree1.commit('add symlink', rev_id='l@cset-0-1')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
652
        self.get_valid_bundle(None, 'l@cset-0-1')
1185.82.88 by Aaron Bentley
Get symlink modification, renames and deletion under test
653
        tt = TreeTransform(self.tree1)
654
        trans_id = tt.trans_id_tree_file_id('link-1')
655
        tt.adjust_path('link2', tt.root, trans_id)
656
        tt.delete_contents(trans_id)
657
        tt.create_symlink('mars', trans_id)
658
        tt.apply()
659
        self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
660
        self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
1185.82.88 by Aaron Bentley
Get symlink modification, renames and deletion under test
661
        tt = TreeTransform(self.tree1)
662
        trans_id = tt.trans_id_tree_file_id('link-1')
663
        tt.delete_contents(trans_id)
664
        tt.create_symlink('jupiter', trans_id)
665
        tt.apply()
666
        self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
667
        self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
1185.82.88 by Aaron Bentley
Get symlink modification, renames and deletion under test
668
        tt = TreeTransform(self.tree1)
669
        trans_id = tt.trans_id_tree_file_id('link-1')
670
        tt.delete_contents(trans_id)
671
        tt.apply()
672
        self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
673
        self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
1185.82.96 by Aaron Bentley
Got first binary test passing
674
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
675
    def test_binary_bundle(self):
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
676
        self.tree1 = self.make_branch_and_tree('b1')
1185.82.96 by Aaron Bentley
Got first binary test passing
677
        self.b1 = self.tree1.branch
678
        tt = TreeTransform(self.tree1)
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
679
        
680
        # Add
681
        tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
2520.4.83 by Aaron Bentley
Clean up tests
682
        tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
683
            'binary-2')
1185.82.96 by Aaron Bentley
Got first binary test passing
684
        tt.apply()
685
        self.tree1.commit('add binary', rev_id='b@cset-0-1')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
686
        self.get_valid_bundle(None, 'b@cset-0-1')
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
687
688
        # Delete
1185.82.97 by Aaron Bentley
Got binary files working for adds, renames, modifications
689
        tt = TreeTransform(self.tree1)
690
        trans_id = tt.trans_id_tree_file_id('binary-1')
691
        tt.delete_contents(trans_id)
692
        tt.apply()
693
        self.tree1.commit('delete binary', rev_id='b@cset-0-2')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
694
        self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
695
696
        # Rename & modify
1185.82.97 by Aaron Bentley
Got binary files working for adds, renames, modifications
697
        tt = TreeTransform(self.tree1)
698
        trans_id = tt.trans_id_tree_file_id('binary-2')
699
        tt.adjust_path('file3', tt.root, trans_id)
700
        tt.delete_contents(trans_id)
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
701
        tt.create_file('file\rcontents\x00\n\x00', trans_id)
1185.82.97 by Aaron Bentley
Got binary files working for adds, renames, modifications
702
        tt.apply()
703
        self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
704
        self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
705
706
        # Modify
1185.82.97 by Aaron Bentley
Got binary files working for adds, renames, modifications
707
        tt = TreeTransform(self.tree1)
708
        trans_id = tt.trans_id_tree_file_id('binary-2')
709
        tt.delete_contents(trans_id)
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
710
        tt.create_file('\x00file\rcontents', trans_id)
1185.82.97 by Aaron Bentley
Got binary files working for adds, renames, modifications
711
        tt.apply()
712
        self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
713
        self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
1185.82.115 by Aaron Bentley
Add test for last-changed special cases
714
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
715
        # Rollup
716
        self.get_valid_bundle(None, 'b@cset-0-4')
717
1185.82.115 by Aaron Bentley
Add test for last-changed special cases
718
    def test_last_modified(self):
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
719
        self.tree1 = self.make_branch_and_tree('b1')
1185.82.115 by Aaron Bentley
Add test for last-changed special cases
720
        self.b1 = self.tree1.branch
721
        tt = TreeTransform(self.tree1)
722
        tt.new_file('file', tt.root, 'file', 'file')
723
        tt.apply()
724
        self.tree1.commit('create file', rev_id='a@lmod-0-1')
725
726
        tt = TreeTransform(self.tree1)
727
        trans_id = tt.trans_id_tree_file_id('file')
728
        tt.delete_contents(trans_id)
729
        tt.create_file('file2', trans_id)
730
        tt.apply()
731
        self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
732
733
        other = self.get_checkout('a@lmod-0-1')
734
        tt = TreeTransform(other)
735
        trans_id = tt.trans_id_tree_file_id('file')
736
        tt.delete_contents(trans_id)
737
        tt.create_file('file2', trans_id)
738
        tt.apply()
739
        other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
740
        _merge_helper([other.basedir, -1], [None, None],
741
                      this_dir=self.tree1.basedir)
1185.82.115 by Aaron Bentley
Add test for last-changed special cases
742
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
743
                          verbose=False)
744
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
745
        bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
746
747
    def test_hide_history(self):
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
748
        self.tree1 = self.make_branch_and_tree('b1')
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
749
        self.b1 = self.tree1.branch
750
1793.3.1 by John Arbash Meinel
Clean up the bundle tests a little bit.
751
        open('b1/one', 'wb').write('one\n')
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
752
        self.tree1.add('one')
753
        self.tree1.commit('add file', rev_id='a@cset-0-1')
1793.3.1 by John Arbash Meinel
Clean up the bundle tests a little bit.
754
        open('b1/one', 'wb').write('two\n')
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
755
        self.tree1.commit('modify', rev_id='a@cset-0-2')
1793.3.1 by John Arbash Meinel
Clean up the bundle tests a little bit.
756
        open('b1/one', 'wb').write('three\n')
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
757
        self.tree1.commit('modify', rev_id='a@cset-0-3')
758
        bundle_file = StringIO()
759
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
760
                               'a@cset-0-1', bundle_file, format=self.format)
2382.1.1 by Ian Clatworthy
Fixes #98510 - bundle selftest fails if email has 'two' embedded
761
        self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
2520.4.32 by Aaron Bentley
Fix test case
762
        self.assertContainsRe(self.get_raw(bundle_file), 'one')
763
        self.assertContainsRe(self.get_raw(bundle_file), 'three')
764
2520.4.75 by Aaron Bentley
Fix traceback on empty bundles.
765
    def test_bundle_same_basis(self):
766
        """Ensure using the basis as the target doesn't cause an error"""
767
        self.tree1 = self.make_branch_and_tree('b1')
768
        self.tree1.commit('add file', rev_id='a@cset-0-1')
769
        bundle_file = StringIO()
770
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
771
                               'a@cset-0-1', bundle_file)
772
2520.4.32 by Aaron Bentley
Fix test case
773
    @staticmethod
774
    def get_raw(bundle_file):
775
        return bundle_file.getvalue()
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
776
1711.7.35 by John Arbash Meinel
Factor out i18n bundle tests, so we don't always skip.
777
    def test_unicode_bundle(self):
778
        # Handle international characters
779
        os.mkdir('b1')
780
        try:
781
            f = open(u'b1/with Dod\xe9', 'wb')
782
        except UnicodeEncodeError:
783
            raise TestSkipped("Filesystem doesn't support unicode")
784
785
        self.tree1 = self.make_branch_and_tree('b1')
786
        self.b1 = self.tree1.branch
787
788
        f.write((u'A file\n'
789
            u'With international man of mystery\n'
790
            u'William Dod\xe9\n').encode('utf-8'))
791
        f.close()
792
2386.1.1 by John Arbash Meinel
Update test_unicode_bundle, since we know how it fails on Mac OSX
793
        self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
794
        self.tree1.commit(u'i18n commit from William Dod\xe9',
1711.7.35 by John Arbash Meinel
Factor out i18n bundle tests, so we don't always skip.
795
                          rev_id='i18n-1', committer=u'William Dod\xe9')
796
2386.1.1 by John Arbash Meinel
Update test_unicode_bundle, since we know how it fails on Mac OSX
797
        if sys.platform == 'darwin':
798
            # On Mac the '\xe9' gets changed to 'e\u0301'
799
            self.assertEqual([u'.bzr', u'with Dode\u0301'],
800
                             sorted(os.listdir(u'b1')))
801
            delta = self.tree1.changes_from(self.tree1.basis_tree())
802
            self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
803
                             delta.removed)
804
            self.knownFailure("Mac OSX doesn't preserve unicode"
805
                              " combining characters.")
806
1711.7.35 by John Arbash Meinel
Factor out i18n bundle tests, so we don't always skip.
807
        # Add
808
        bundle = self.get_valid_bundle(None, 'i18n-1')
809
810
        # Modified
811
        f = open(u'b1/with Dod\xe9', 'wb')
812
        f.write(u'Modified \xb5\n'.encode('utf8'))
813
        f.close()
814
        self.tree1.commit(u'modified', rev_id='i18n-2')
815
816
        bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
817
        
818
        # Renamed
819
        self.tree1.rename_one(u'with Dod\xe9', u'B\xe5gfors')
820
        self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
821
                          committer=u'Erik B\xe5gfors')
822
823
        bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
824
825
        # Removed
826
        self.tree1.remove([u'B\xe5gfors'])
827
        self.tree1.commit(u'removed', rev_id='i18n-4')
828
829
        bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
830
831
        # Rollup
832
        bundle = self.get_valid_bundle(None, 'i18n-4')
833
834
1711.7.34 by John Arbash Meinel
Include a test to ensure bundles handle trailing whitespace.
835
    def test_whitespace_bundle(self):
836
        if sys.platform in ('win32', 'cygwin'):
837
            raise TestSkipped('Windows doesn\'t support filenames'
838
                              ' with tabs or trailing spaces')
839
        self.tree1 = self.make_branch_and_tree('b1')
840
        self.b1 = self.tree1.branch
841
842
        self.build_tree(['b1/trailing space '])
843
        self.tree1.add(['trailing space '])
844
        # TODO: jam 20060701 Check for handling files with '\t' characters
845
        #       once we actually support them
846
847
        # Added
848
        self.tree1.commit('funky whitespace', rev_id='white-1')
849
850
        bundle = self.get_valid_bundle(None, 'white-1')
851
852
        # Modified
853
        open('b1/trailing space ', 'ab').write('add some text\n')
854
        self.tree1.commit('add text', rev_id='white-2')
855
856
        bundle = self.get_valid_bundle('white-1', 'white-2')
857
858
        # Renamed
859
        self.tree1.rename_one('trailing space ', ' start and end space ')
860
        self.tree1.commit('rename', rev_id='white-3')
861
862
        bundle = self.get_valid_bundle('white-2', 'white-3')
863
864
        # Removed
865
        self.tree1.remove([' start and end space '])
866
        self.tree1.commit('removed', rev_id='white-4')
867
868
        bundle = self.get_valid_bundle('white-3', 'white-4')
869
        
870
        # Now test a complet roll-up
871
        bundle = self.get_valid_bundle(None, 'white-4')
872
1793.3.9 by John Arbash Meinel
Add a test to timezone for non integer tz offsets
873
    def test_alt_timezone_bundle(self):
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
874
        self.tree1 = self.make_branch_and_memory_tree('b1')
1793.3.9 by John Arbash Meinel
Add a test to timezone for non integer tz offsets
875
        self.b1 = self.tree1.branch
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
876
        builder = treebuilder.TreeBuilder()
1793.3.9 by John Arbash Meinel
Add a test to timezone for non integer tz offsets
877
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
878
        self.tree1.lock_write()
879
        builder.start_tree(self.tree1)
880
        builder.build(['newfile'])
881
        builder.finish_tree()
1793.3.9 by John Arbash Meinel
Add a test to timezone for non integer tz offsets
882
883
        # Asia/Colombo offset = 5 hours 30 minutes
884
        self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
885
                          timezone=19800, timestamp=1152544886.0)
886
887
        bundle = self.get_valid_bundle(None, 'tz-1')
888
        
889
        rev = bundle.revisions[0]
890
        self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
891
        self.assertEqual(19800, rev.timezone)
892
        self.assertEqual(1152544886.0, rev.timestamp)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
893
        self.tree1.unlock()
1793.3.9 by John Arbash Meinel
Add a test to timezone for non integer tz offsets
894
1910.2.1 by Aaron Bentley
Ensure root entry always has a revision
895
    def test_bundle_root_id(self):
896
        self.tree1 = self.make_branch_and_tree('b1')
897
        self.b1 = self.tree1.branch
898
        self.tree1.commit('message', rev_id='revid1')
899
        bundle = self.get_valid_bundle(None, 'revid1')
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
900
        tree = self.get_bundle_tree(bundle, 'revid1')
1910.2.6 by Aaron Bentley
Update for merge review, handle deprecations
901
        self.assertEqual('revid1', tree.inventory.root.revision)
1910.2.1 by Aaron Bentley
Ensure root entry always has a revision
902
1551.14.9 by Aaron Bentley
rename get_target_revision to install_revisions
903
    def test_install_revisions(self):
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
904
        self.tree1 = self.make_branch_and_tree('b1')
905
        self.b1 = self.tree1.branch
906
        self.tree1.commit('message', rev_id='rev2a')
907
        bundle = self.get_valid_bundle(None, 'rev2a')
908
        branch2 = self.make_branch('b2')
909
        self.assertFalse(branch2.repository.has_revision('rev2a'))
1551.14.9 by Aaron Bentley
rename get_target_revision to install_revisions
910
        target_revision = bundle.install_revisions(branch2.repository)
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
911
        self.assertTrue(branch2.repository.has_revision('rev2a'))
1551.14.9 by Aaron Bentley
rename get_target_revision to install_revisions
912
        self.assertEqual('rev2a', target_revision)
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
913
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
914
    def test_bundle_empty_property(self):
915
        """Test serializing revision properties with an empty value."""
916
        tree = self.make_branch_and_memory_tree('tree')
917
        tree.lock_write()
918
        self.addCleanup(tree.unlock)
919
        tree.add([''], ['TREE_ROOT'])
920
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
921
        self.b1 = tree.branch
922
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
2520.4.33 by Aaron Bentley
remove test dependencies on serialization minutia
923
        bundle = read_bundle(bundle_sio)
924
        revision_info = bundle.revisions[0]
925
        self.assertEqual('rev1', revision_info.revision_id)
926
        rev = revision_info.as_revision()
927
        self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
928
                         rev.properties)
929
930
    def test_bundle_sorted_properties(self):
931
        """For stability the writer should write properties in sorted order."""
932
        tree = self.make_branch_and_memory_tree('tree')
933
        tree.lock_write()
934
        self.addCleanup(tree.unlock)
935
936
        tree.add([''], ['TREE_ROOT'])
937
        tree.commit('One', rev_id='rev1',
938
                    revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
939
        self.b1 = tree.branch
940
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
941
        bundle = read_bundle(bundle_sio)
942
        revision_info = bundle.revisions[0]
943
        self.assertEqual('rev1', revision_info.revision_id)
944
        rev = revision_info.as_revision()
945
        self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
946
                          'd':'1'}, rev.properties)
947
948
    def test_bundle_unicode_properties(self):
949
        """We should be able to round trip a non-ascii property."""
950
        tree = self.make_branch_and_memory_tree('tree')
951
        tree.lock_write()
952
        self.addCleanup(tree.unlock)
953
954
        tree.add([''], ['TREE_ROOT'])
955
        # Revisions themselves do not require anything about revision property
956
        # keys, other than that they are a basestring, and do not contain
957
        # whitespace.
958
        # However, Testaments assert than they are str(), and thus should not
959
        # be Unicode.
960
        tree.commit('One', rev_id='rev1',
961
                    revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
962
        self.b1 = tree.branch
963
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
964
        bundle = read_bundle(bundle_sio)
965
        revision_info = bundle.revisions[0]
966
        self.assertEqual('rev1', revision_info.revision_id)
967
        rev = revision_info.as_revision()
968
        self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
969
                          'alpha':u'\u03b1'}, rev.properties)
970
2520.4.43 by Aaron Bentley
Fix test suite
971
    def test_bundle_with_ghosts(self):
972
        tree = self.make_branch_and_tree('tree')
973
        self.b1 = tree.branch
974
        self.build_tree_contents([('tree/file', 'content1')])
975
        tree.add(['file'])
976
        tree.commit('rev1')
977
        self.build_tree_contents([('tree/file', 'content2')])
978
        tree.add_parent_tree_id('ghost')
979
        tree.commit('rev2', rev_id='rev2')
980
        bundle = self.get_valid_bundle(None, 'rev2')
981
982
983
class V08BundleTester(BundleTester, TestCaseWithTransport):
2520.4.33 by Aaron Bentley
remove test dependencies on serialization minutia
984
985
    format = '0.8'
986
987
    def test_bundle_empty_property(self):
988
        """Test serializing revision properties with an empty value."""
989
        tree = self.make_branch_and_memory_tree('tree')
990
        tree.lock_write()
991
        self.addCleanup(tree.unlock)
992
        tree.add([''], ['TREE_ROOT'])
993
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
994
        self.b1 = tree.branch
995
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
996
        self.assertContainsRe(bundle_sio.getvalue(),
997
                              '# properties:\n'
998
                              '#   branch-nick: tree\n'
2447.1.3 by John Arbash Meinel
Change the default serializer to include a trailing whitespace for empty properties.
999
                              '#   empty: \n'
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
1000
                              '#   one: two\n'
1001
                             )
1002
        bundle = read_bundle(bundle_sio)
1003
        revision_info = bundle.revisions[0]
1004
        self.assertEqual('rev1', revision_info.revision_id)
1005
        rev = revision_info.as_revision()
1006
        self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1007
                         rev.properties)
1008
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1009
    def get_bundle_tree(self, bundle, revision_id):
1010
        repository = self.make_repository('repo')
1011
        return bundle.revision_tree(repository, 'revid1')
1012
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
1013
    def test_bundle_empty_property_alt(self):
2447.1.3 by John Arbash Meinel
Change the default serializer to include a trailing whitespace for empty properties.
1014
        """Test serializing revision properties with an empty value.
1015
1016
        Older readers had a bug when reading an empty property.
1017
        They assumed that all keys ended in ': \n'. However they would write an
1018
        empty value as ':\n'. This tests make sure that all newer bzr versions
1019
        can handle th second form.
1020
        """
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
1021
        tree = self.make_branch_and_memory_tree('tree')
1022
        tree.lock_write()
1023
        self.addCleanup(tree.unlock)
1024
        tree.add([''], ['TREE_ROOT'])
1025
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1026
        self.b1 = tree.branch
1027
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
1028
        txt = bundle_sio.getvalue()
2447.1.3 by John Arbash Meinel
Change the default serializer to include a trailing whitespace for empty properties.
1029
        loc = txt.find('#   empty: ') + len('#   empty:')
1030
        # Create a new bundle, which strips the trailing space after empty
1031
        bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
1032
1033
        self.assertContainsRe(bundle_sio.getvalue(),
1034
                              '# properties:\n'
1035
                              '#   branch-nick: tree\n'
2447.1.3 by John Arbash Meinel
Change the default serializer to include a trailing whitespace for empty properties.
1036
                              '#   empty:\n'
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
1037
                              '#   one: two\n'
1038
                             )
1039
        bundle = read_bundle(bundle_sio)
1040
        revision_info = bundle.revisions[0]
1041
        self.assertEqual('rev1', revision_info.revision_id)
1042
        rev = revision_info.as_revision()
1043
        self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1044
                         rev.properties)
1045
2447.1.1 by John Arbash Meinel
For stability and ease of testing, write properties in sorted order.
1046
    def test_bundle_sorted_properties(self):
1047
        """For stability the writer should write properties in sorted order."""
1048
        tree = self.make_branch_and_memory_tree('tree')
1049
        tree.lock_write()
1050
        self.addCleanup(tree.unlock)
1051
1052
        tree.add([''], ['TREE_ROOT'])
1053
        tree.commit('One', rev_id='rev1',
1054
                    revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1055
        self.b1 = tree.branch
1056
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
1057
        self.assertContainsRe(bundle_sio.getvalue(),
1058
                              '# properties:\n'
1059
                              '#   a: 4\n'
1060
                              '#   b: 3\n'
1061
                              '#   branch-nick: tree\n'
1062
                              '#   c: 2\n'
1063
                              '#   d: 1\n'
1064
                             )
2447.1.4 by John Arbash Meinel
Add a test that we properly round-trip unicode properties.
1065
        bundle = read_bundle(bundle_sio)
1066
        revision_info = bundle.revisions[0]
1067
        self.assertEqual('rev1', revision_info.revision_id)
1068
        rev = revision_info.as_revision()
1069
        self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1070
                          'd':'1'}, rev.properties)
1071
1072
    def test_bundle_unicode_properties(self):
1073
        """We should be able to round trip a non-ascii property."""
1074
        tree = self.make_branch_and_memory_tree('tree')
1075
        tree.lock_write()
1076
        self.addCleanup(tree.unlock)
1077
1078
        tree.add([''], ['TREE_ROOT'])
1079
        # Revisions themselves do not require anything about revision property
1080
        # keys, other than that they are a basestring, and do not contain
1081
        # whitespace.
1082
        # However, Testaments assert than they are str(), and thus should not
1083
        # be Unicode.
1084
        tree.commit('One', rev_id='rev1',
1085
                    revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1086
        self.b1 = tree.branch
1087
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
1088
        self.assertContainsRe(bundle_sio.getvalue(),
1089
                              '# properties:\n'
1090
                              '#   alpha: \xce\xb1\n'
1091
                              '#   branch-nick: tree\n'
1092
                              '#   omega: \xce\xa9\n'
1093
                             )
1094
        bundle = read_bundle(bundle_sio)
1095
        revision_info = bundle.revisions[0]
1096
        self.assertEqual('rev1', revision_info.revision_id)
1097
        rev = revision_info.as_revision()
1098
        self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1099
                          'alpha':u'\u03b1'}, rev.properties)
2447.1.1 by John Arbash Meinel
For stability and ease of testing, write properties in sorted order.
1100
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1101
1910.2.59 by Aaron Bentley
Test 0.9 bundles for knit format1 and knit format2
1102
class V09BundleKnit2Tester(V08BundleTester):
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
1103
1104
    format = '0.9'
1105
1106
    def bzrdir_format(self):
1107
        format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
1108
        format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
1109
        return format
1110
1111
1910.2.59 by Aaron Bentley
Test 0.9 bundles for knit format1 and knit format2
1112
class V09BundleKnit1Tester(V08BundleTester):
1113
1114
    format = '0.9'
1115
1116
    def bzrdir_format(self):
1117
        format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
1118
        format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.59 by Aaron Bentley
Test 0.9 bundles for knit format1 and knit format2
1119
        return format
1120
1121
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1122
class V4BundleTester(BundleTester, TestCaseWithTransport):
2520.4.14 by Aaron Bentley
Get most tests passing, use format header
1123
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1124
    format = '4alpha'
2520.4.14 by Aaron Bentley
Get most tests passing, use format header
1125
1126
    def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1127
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
1128
        Make sure that the text generated is valid, and that it
1129
        can be applied against the base, and generate the same information.
1130
        
1131
        :return: The in-memory bundle 
1132
        """
1133
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1134
1135
        # This should also validate the generated bundle 
1136
        bundle = read_bundle(bundle_txt)
1137
        repository = self.b1.repository
1138
        for bundle_rev in bundle.real_revisions:
1139
            # These really should have already been checked when we read the
1140
            # bundle, since it computes the sha1 hash for the revision, which
1141
            # only will match if everything is okay, but lets be explicit about
1142
            # it
1143
            branch_rev = repository.get_revision(bundle_rev.revision_id)
1144
            for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1145
                      'timestamp', 'timezone', 'message', 'committer', 
1146
                      'parent_ids', 'properties'):
1147
                self.assertEqual(getattr(branch_rev, a), 
1148
                                 getattr(bundle_rev, a))
1149
            self.assertEqual(len(branch_rev.parent_ids), 
1150
                             len(bundle_rev.parent_ids))
2520.4.29 by Aaron Bentley
Reactivate some testing, fix topo_iter
1151
        self.assertEqual(set(rev_ids),
1152
                         set([r.revision_id for r in bundle.real_revisions]))
2520.4.14 by Aaron Bentley
Get most tests passing, use format header
1153
        self.valid_apply_bundle(base_rev_id, bundle,
1154
                                   checkout_dir=checkout_dir)
1155
1156
        return bundle
1157
2520.4.34 by Aaron Bentley
Add signature support
1158
    def get_invalid_bundle(self, base_rev_id, rev_id):
1159
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
1160
        Munge the text so that it's invalid.
1161
1162
        :return: The in-memory bundle
1163
        """
1164
        from bzrlib.bundle import serializer
1165
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1166
        new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1167
        new_text = new_text.replace('<file file_id="exe-1"',
1168
                                    '<file executable="y" file_id="exe-1"')
2520.4.70 by Aaron Bentley
Yank patch-handling functionality
1169
        new_text = new_text.replace('B407', 'B422')
2520.4.34 by Aaron Bentley
Add signature support
1170
        bundle_txt = StringIO()
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1171
        bundle_txt.write(serializer._get_bundle_header('4alpha'))
2520.4.34 by Aaron Bentley
Add signature support
1172
        bundle_txt.write('\n')
2520.4.76 by Aaron Bentley
Move base64-encoding into merge directives
1173
        bundle_txt.write(new_text.encode('bz2'))
2520.4.34 by Aaron Bentley
Add signature support
1174
        bundle_txt.seek(0)
1175
        bundle = read_bundle(bundle_txt)
1176
        self.valid_apply_bundle(base_rev_id, bundle)
1177
        return bundle
1178
2520.4.14 by Aaron Bentley
Get most tests passing, use format header
1179
    def create_bundle_text(self, base_rev_id, rev_id):
1180
        bundle_txt = StringIO()
1181
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id, 
1182
                               bundle_txt, format=self.format)
1183
        bundle_txt.seek(0)
1184
        self.assertEqual(bundle_txt.readline(), 
1185
                         '# Bazaar revision bundle v%s\n' % self.format)
1186
        self.assertEqual(bundle_txt.readline(), '#\n')
1187
        rev = self.b1.repository.get_revision(rev_id)
1188
        bundle_txt.seek(0)
1189
        return bundle_txt, rev_ids
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1190
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1191
    def get_bundle_tree(self, bundle, revision_id):
1192
        repository = self.make_repository('repo')
1193
        bundle.install_revisions(repository)
1194
        return repository.revision_tree(revision_id)
1195
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1196
    def test_creation(self):
1197
        tree = self.make_branch_and_tree('tree')
2520.4.8 by Aaron Bentley
Serialize inventory
1198
        self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
2520.4.6 by Aaron Bentley
Get installation started
1199
        tree.add('file', 'fileid-2')
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1200
        tree.commit('added file', rev_id='rev1')
2520.4.8 by Aaron Bentley
Serialize inventory
1201
        self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
2520.4.10 by Aaron Bentley
Enable installation of revisions
1202
        tree.commit('changed file', rev_id='rev2')
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1203
        s = StringIO()
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1204
        serializer = BundleSerializerV4('1.0')
2520.4.8 by Aaron Bentley
Serialize inventory
1205
        serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
2520.4.5 by Aaron Bentley
Start work on reading mpbundles
1206
        s.seek(0)
2520.4.6 by Aaron Bentley
Get installation started
1207
        tree2 = self.make_branch_and_tree('target')
1208
        target_repo = tree2.branch.repository
1209
        install_bundle(target_repo, serializer.read(s))
1210
        vf = target_repo.weave_store.get_weave('fileid-2',
1211
            target_repo.get_transaction())
2520.4.8 by Aaron Bentley
Serialize inventory
1212
        self.assertEqual('contents1\nstatic\n', vf.get_text('rev1'))
1213
        self.assertEqual('contents2\nstatic\n', vf.get_text('rev2'))
1214
        rtree = target_repo.revision_tree('rev2')
2520.4.9 by Aaron Bentley
Test inventory_vf parents
1215
        inventory_vf = target_repo.get_inventory_weave()
1216
        self.assertEqual(['rev1'], inventory_vf.get_parents('rev2'))
2520.4.10 by Aaron Bentley
Enable installation of revisions
1217
        self.assertEqual('changed file',
1218
                         target_repo.get_revision('rev2').message)
2520.4.6 by Aaron Bentley
Get installation started
1219
1220
    def test_name_encode(self):
2520.4.68 by Aaron Bentley
Change name separators to all-slash
1221
        self.assertEqual('revision/rev1',
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1222
            v4.BundleWriter.encode_name('revision', 'rev1'))
2520.4.68 by Aaron Bentley
Change name separators to all-slash
1223
        self.assertEqual('file/rev1/file-id-1',
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1224
            v4.BundleWriter.encode_name('file', 'rev1', 'file-id-1'))
2520.4.6 by Aaron Bentley
Get installation started
1225
1226
    def test_name_decode(self):
1227
        self.assertEqual(('revision', 'rev1', None),
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1228
            v4.BundleReader.decode_name('revision/rev1'))
2520.4.6 by Aaron Bentley
Get installation started
1229
        self.assertEqual(('file', 'rev1', 'file-id-1'),
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1230
            v4.BundleReader.decode_name('file/rev1/file-id-1'))
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1231
2520.4.32 by Aaron Bentley
Fix test case
1232
    @staticmethod
1233
    def get_raw(bundle_file):
1234
        bundle_file.seek(0)
2520.4.70 by Aaron Bentley
Yank patch-handling functionality
1235
        line = bundle_file.readline()
1236
        line = bundle_file.readline()
2520.4.32 by Aaron Bentley
Fix test case
1237
        lines = bundle_file.readlines()
2520.4.76 by Aaron Bentley
Move base64-encoding into merge directives
1238
        return ''.join(lines).decode('bz2')
2520.4.32 by Aaron Bentley
Fix test case
1239
2520.4.34 by Aaron Bentley
Add signature support
1240
    def test_copy_signatures(self):
1241
        tree_a = self.make_branch_and_tree('tree_a')
1242
        import bzrlib.gpg
1243
        import bzrlib.commit as commit
1244
        oldstrategy = bzrlib.gpg.GPGStrategy
1245
        branch = tree_a.branch
1246
        repo_a = branch.repository
1247
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1248
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
1249
        try:
1250
            from bzrlib.testament import Testament
1251
            # monkey patch gpg signing mechanism
1252
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1253
            new_config = test_commit.MustSignConfig(branch)
1254
            commit.Commit(config=new_config).commit(message="base",
1255
                                                    allow_pointless=True,
1256
                                                    rev_id='B',
1257
                                                    working_tree=tree_a)
1258
            def sign(text):
1259
                return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1260
            self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1261
        finally:
1262
            bzrlib.gpg.GPGStrategy = oldstrategy
1263
        tree_b = self.make_branch_and_tree('tree_b')
1264
        repo_b = tree_b.branch.repository
1265
        s = StringIO()
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1266
        serializer = BundleSerializerV4('4alpha')
2520.4.34 by Aaron Bentley
Add signature support
1267
        serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1268
        s.seek(0)
1269
        install_bundle(repo_b, serializer.read(s))
1270
        self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1271
        self.assertEqual(repo_b.get_signature_text('B'),
1272
                         repo_a.get_signature_text('B'))
1273
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1274
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1275
class MungedBundleTester(object):
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1276
1277
    def build_test_bundle(self):
1278
        wt = self.make_branch_and_tree('b1')
1279
1280
        self.build_tree(['b1/one'])
1281
        wt.add('one')
1282
        wt.commit('add one', rev_id='a@cset-0-1')
1283
        self.build_tree(['b1/two'])
1284
        wt.add('two')
1793.3.14 by John Arbash Meinel
Actually fix the bug with missing trailing newline bug #49182
1285
        wt.commit('add two', rev_id='a@cset-0-2',
1286
                  revprops={'branch-nick':'test'})
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1287
1288
        bundle_txt = StringIO()
1289
        rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1290
                               'a@cset-0-1', bundle_txt, self.format)
1291
        self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1292
        bundle_txt.seek(0, 0)
1293
        return bundle_txt
1294
1295
    def check_valid(self, bundle):
1296
        """Check that after whatever munging, the final object is valid."""
1793.3.14 by John Arbash Meinel
Actually fix the bug with missing trailing newline bug #49182
1297
        self.assertEqual(['a@cset-0-2'],
1793.3.4 by John Arbash Meinel
[merge] bzr.dev 1804 and fix conflicts.
1298
            [r.revision_id for r in bundle.real_revisions])
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1299
1300
    def test_extra_whitespace(self):
1301
        bundle_txt = self.build_test_bundle()
1302
1303
        # Seek to the end of the file
1304
        # Adding one extra newline used to give us
1305
        # TypeError: float() argument must be a string or a number
1306
        bundle_txt.seek(0, 2)
1307
        bundle_txt.write('\n')
1308
        bundle_txt.seek(0)
1309
1793.3.4 by John Arbash Meinel
[merge] bzr.dev 1804 and fix conflicts.
1310
        bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1311
        self.check_valid(bundle)
1312
1313
    def test_extra_whitespace_2(self):
1314
        bundle_txt = self.build_test_bundle()
1315
1316
        # Seek to the end of the file
1317
        # Adding two extra newlines used to give us
1318
        # MalformedPatches: The first line of all patches should be ...
1319
        bundle_txt.seek(0, 2)
1320
        bundle_txt.write('\n\n')
1321
        bundle_txt.seek(0)
1322
1793.3.4 by John Arbash Meinel
[merge] bzr.dev 1804 and fix conflicts.
1323
        bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1324
        self.check_valid(bundle)
1325
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1326
1327
class MungedBundleTesterV09(TestCaseWithTransport, MungedBundleTester):
1328
1329
    format = '0.9'
1330
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1331
    def test_missing_trailing_whitespace(self):
1332
        bundle_txt = self.build_test_bundle()
1333
1334
        # Remove a trailing newline, it shouldn't kill the parser
1335
        raw = bundle_txt.getvalue()
1336
        # The contents of the bundle don't have to be this, but this
1337
        # test is concerned with the exact case where the serializer
1338
        # creates a blank line at the end, and fails if that
1339
        # line is stripped
1340
        self.assertEqual('\n\n', raw[-2:])
1793.3.14 by John Arbash Meinel
Actually fix the bug with missing trailing newline bug #49182
1341
        bundle_txt = StringIO(raw[:-1])
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1342
1793.3.4 by John Arbash Meinel
[merge] bzr.dev 1804 and fix conflicts.
1343
        bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1344
        self.check_valid(bundle)
1793.3.14 by John Arbash Meinel
Actually fix the bug with missing trailing newline bug #49182
1345
1793.3.16 by John Arbash Meinel
Add tests to ensure that we gracefully handle opening and trailing non-bundle text.
1346
    def test_opening_text(self):
1347
        bundle_txt = self.build_test_bundle()
1348
1349
        bundle_txt = StringIO("Some random\nemail comments\n"
1350
                              + bundle_txt.getvalue())
1351
1352
        bundle = read_bundle(bundle_txt)
1353
        self.check_valid(bundle)
1354
1355
    def test_trailing_text(self):
1356
        bundle_txt = self.build_test_bundle()
1357
1358
        bundle_txt = StringIO(bundle_txt.getvalue() +
1359
                              "Some trailing\nrandom\ntext\n")
1360
1361
        bundle = read_bundle(bundle_txt)
1362
        self.check_valid(bundle)
2520.4.56 by Aaron Bentley
Begin adding support for arbitrary metadata
1363
1364
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1365
class MungedBundleTesterV4(TestCaseWithTransport, MungedBundleTester):
1366
1367
    format = '4alpha'
1368
1369
2520.4.56 by Aaron Bentley
Begin adding support for arbitrary metadata
1370
class TestBundleWriterReader(TestCase):
1371
1372
    def test_roundtrip_record(self):
1373
        fileobj = StringIO()
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1374
        writer = v4.BundleWriter(fileobj)
2520.4.56 by Aaron Bentley
Begin adding support for arbitrary metadata
1375
        writer.begin()
1376
        writer._add_record("Record body", {'parents': ['1', '3']},
1377
                           'file', 'revid', 'fileid')
1378
        writer.end()
1379
        fileobj.seek(0)
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1380
        reader = v4.BundleReader(fileobj)
2520.4.56 by Aaron Bentley
Begin adding support for arbitrary metadata
1381
        record = reader.iter_records().next()
2520.4.58 by Aaron Bentley
Propogate support for metadata to iter_revisions, add storage kind
1382
        self.assertEqual(("Record body", {'parents': ['1', '3']}, 'file',
2520.4.56 by Aaron Bentley
Begin adding support for arbitrary metadata
1383
                          'revid', 'fileid'), record)