/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()
2520.4.84 by Aaron Bentley
Fix heisenbug record-rewriting test
568
        # have to fix length of file-id so that we can predictably rewrite
569
        # a (length-prefixed) record containing it later.
570
        self.tree1.add('with space.txt', 'withspace-id')
1185.82.14 by Aaron Bentley
API updates
571
        self.tree1.add([
2520.4.84 by Aaron Bentley
Fix heisenbug record-rewriting test
572
                  'dir'
0.5.84 by John Arbash Meinel
(broken) problem with removes.
573
                , 'dir/filein subdir.c'
574
                , 'dir/WithCaps.txt'
1711.7.32 by John Arbash Meinel
Switch from a trailing space to a beginning space, which is supported everywhere.
575
                , 'dir/ pre space'
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
576
                , 'dir/nolastnewline.txt'
0.5.84 by John Arbash Meinel
(broken) problem with removes.
577
                , 'sub'
578
                , 'sub/sub'
579
                , 'sub/sub/nonempty.txt'
580
                , 'sub/sub/emptyfile.txt'
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
581
                ])
1185.82.14 by Aaron Bentley
API updates
582
        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.
583
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
584
        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.
585
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
586
        # Check a rollup bundle 
587
        bundle = self.get_valid_bundle(None, 'a@cset-0-2')
0.5.84 by John Arbash Meinel
(broken) problem with removes.
588
589
        # Now delete entries
1185.82.21 by Aaron Bentley
Stop using deprecated function
590
        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.
591
                ['sub/sub/nonempty.txt'
0.5.84 by John Arbash Meinel
(broken) problem with removes.
592
                , '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.
593
                , 'sub/sub'
594
                ])
1185.82.68 by Aaron Bentley
Handle execute bit on modified files
595
        tt = TreeTransform(self.tree1)
596
        trans_id = tt.trans_id_tree_file_id('exe-1')
597
        tt.set_executability(False, trans_id)
598
        tt.apply()
1185.82.19 by Aaron Bentley
More API updates
599
        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.
600
        
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
601
        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
602
        self.assertRaises((TestamentMismatch,
603
            errors.VersionedFileInvalidChecksum), self.get_invalid_bundle,
604
            'a@cset-0-2', 'a@cset-0-3')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
605
        # Check a rollup bundle 
606
        bundle = self.get_valid_bundle(None, 'a@cset-0-3')
0.5.84 by John Arbash Meinel
(broken) problem with removes.
607
608
        # Now move the directory
1185.82.19 by Aaron Bentley
More API updates
609
        self.tree1.rename_one('dir', 'sub/dir')
610
        self.tree1.commit('rename dir', rev_id='a@cset-0-4')
0.5.84 by John Arbash Meinel
(broken) problem with removes.
611
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
612
        bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
613
        # Check a rollup bundle 
614
        bundle = self.get_valid_bundle(None, 'a@cset-0-4')
0.5.84 by John Arbash Meinel
(broken) problem with removes.
615
0.5.87 by John Arbash Meinel
Handling international characters, added more test cases.
616
        # Modified files
617
        open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
2520.4.83 by Aaron Bentley
Clean up tests
618
        open('b1/sub/dir/ pre space', 'ab').write(
619
             '\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
620
        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.
621
        self.tree1.rename_one('sub/dir/ pre space', 
622
                              'sub/ start space')
1185.82.19 by Aaron Bentley
More API updates
623
        self.tree1.commit('Modified files', rev_id='a@cset-0-5')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
624
        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.
625
1185.82.70 by Aaron Bentley
Handle renamed files better
626
        self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
627
        self.tree1.rename_one('with space.txt', 'WithCaps.txt')
628
        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.
629
        self.tree1.commit(u'swap filenames', rev_id='a@cset-0-6',
630
                          verbose=False)
631
        bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
632
        other = self.get_checkout('a@cset-0-5')
1910.2.62 by Aaron Bentley
Cleanups
633
        tree1_inv = self.tree1.branch.repository.get_inventory_xml(
634
            'a@cset-0-5')
1910.2.54 by Aaron Bentley
Implement testament format 3 strict
635
        tree2_inv = other.branch.repository.get_inventory_xml('a@cset-0-5')
636
        self.assertEqualDiff(tree1_inv, tree2_inv)
1711.7.35 by John Arbash Meinel
Factor out i18n bundle tests, so we don't always skip.
637
        other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
638
        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.
639
        _merge_helper([other.basedir, -1], [None, None],
640
                      this_dir=self.tree1.basedir)
1711.7.35 by John Arbash Meinel
Factor out i18n bundle tests, so we don't always skip.
641
        self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
1185.82.70 by Aaron Bentley
Handle renamed files better
642
                          verbose=False)
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
643
        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
644
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
645
    def test_symlink_bundle(self):
1185.82.87 by Aaron Bentley
Got symlink adding working
646
        if not has_symlinks():
647
            raise TestSkipped("No symlink support")
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
648
        self.tree1 = self.make_branch_and_tree('b1')
1185.82.87 by Aaron Bentley
Got symlink adding working
649
        self.b1 = self.tree1.branch
650
        tt = TreeTransform(self.tree1)
1185.82.88 by Aaron Bentley
Get symlink modification, renames and deletion under test
651
        tt.new_symlink('link', tt.root, 'bar/foo', 'link-1')
1185.82.87 by Aaron Bentley
Got symlink adding working
652
        tt.apply()
653
        self.tree1.commit('add symlink', rev_id='l@cset-0-1')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
654
        self.get_valid_bundle(None, 'l@cset-0-1')
1185.82.88 by Aaron Bentley
Get symlink modification, renames and deletion under test
655
        tt = TreeTransform(self.tree1)
656
        trans_id = tt.trans_id_tree_file_id('link-1')
657
        tt.adjust_path('link2', tt.root, trans_id)
658
        tt.delete_contents(trans_id)
659
        tt.create_symlink('mars', trans_id)
660
        tt.apply()
661
        self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
662
        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
663
        tt = TreeTransform(self.tree1)
664
        trans_id = tt.trans_id_tree_file_id('link-1')
665
        tt.delete_contents(trans_id)
666
        tt.create_symlink('jupiter', trans_id)
667
        tt.apply()
668
        self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
669
        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
670
        tt = TreeTransform(self.tree1)
671
        trans_id = tt.trans_id_tree_file_id('link-1')
672
        tt.delete_contents(trans_id)
673
        tt.apply()
674
        self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
675
        self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
1185.82.96 by Aaron Bentley
Got first binary test passing
676
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
677
    def test_binary_bundle(self):
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
678
        self.tree1 = self.make_branch_and_tree('b1')
1185.82.96 by Aaron Bentley
Got first binary test passing
679
        self.b1 = self.tree1.branch
680
        tt = TreeTransform(self.tree1)
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
681
        
682
        # Add
683
        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
684
        tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
685
            'binary-2')
1185.82.96 by Aaron Bentley
Got first binary test passing
686
        tt.apply()
687
        self.tree1.commit('add binary', rev_id='b@cset-0-1')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
688
        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.
689
690
        # Delete
1185.82.97 by Aaron Bentley
Got binary files working for adds, renames, modifications
691
        tt = TreeTransform(self.tree1)
692
        trans_id = tt.trans_id_tree_file_id('binary-1')
693
        tt.delete_contents(trans_id)
694
        tt.apply()
695
        self.tree1.commit('delete binary', rev_id='b@cset-0-2')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
696
        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.
697
698
        # Rename & modify
1185.82.97 by Aaron Bentley
Got binary files working for adds, renames, modifications
699
        tt = TreeTransform(self.tree1)
700
        trans_id = tt.trans_id_tree_file_id('binary-2')
701
        tt.adjust_path('file3', tt.root, trans_id)
702
        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.
703
        tt.create_file('file\rcontents\x00\n\x00', trans_id)
1185.82.97 by Aaron Bentley
Got binary files working for adds, renames, modifications
704
        tt.apply()
705
        self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
706
        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.
707
708
        # Modify
1185.82.97 by Aaron Bentley
Got binary files working for adds, renames, modifications
709
        tt = TreeTransform(self.tree1)
710
        trans_id = tt.trans_id_tree_file_id('binary-2')
711
        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.
712
        tt.create_file('\x00file\rcontents', trans_id)
1185.82.97 by Aaron Bentley
Got binary files working for adds, renames, modifications
713
        tt.apply()
714
        self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
715
        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
716
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
717
        # Rollup
718
        self.get_valid_bundle(None, 'b@cset-0-4')
719
1185.82.115 by Aaron Bentley
Add test for last-changed special cases
720
    def test_last_modified(self):
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
721
        self.tree1 = self.make_branch_and_tree('b1')
1185.82.115 by Aaron Bentley
Add test for last-changed special cases
722
        self.b1 = self.tree1.branch
723
        tt = TreeTransform(self.tree1)
724
        tt.new_file('file', tt.root, 'file', 'file')
725
        tt.apply()
726
        self.tree1.commit('create file', rev_id='a@lmod-0-1')
727
728
        tt = TreeTransform(self.tree1)
729
        trans_id = tt.trans_id_tree_file_id('file')
730
        tt.delete_contents(trans_id)
731
        tt.create_file('file2', trans_id)
732
        tt.apply()
733
        self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
734
735
        other = self.get_checkout('a@lmod-0-1')
736
        tt = TreeTransform(other)
737
        trans_id = tt.trans_id_tree_file_id('file')
738
        tt.delete_contents(trans_id)
739
        tt.create_file('file2', trans_id)
740
        tt.apply()
741
        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.
742
        _merge_helper([other.basedir, -1], [None, None],
743
                      this_dir=self.tree1.basedir)
1185.82.115 by Aaron Bentley
Add test for last-changed special cases
744
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
745
                          verbose=False)
746
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
747
        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
748
749
    def test_hide_history(self):
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
750
        self.tree1 = self.make_branch_and_tree('b1')
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
751
        self.b1 = self.tree1.branch
752
1793.3.1 by John Arbash Meinel
Clean up the bundle tests a little bit.
753
        open('b1/one', 'wb').write('one\n')
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
754
        self.tree1.add('one')
755
        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.
756
        open('b1/one', 'wb').write('two\n')
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
757
        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.
758
        open('b1/one', 'wb').write('three\n')
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
759
        self.tree1.commit('modify', rev_id='a@cset-0-3')
760
        bundle_file = StringIO()
761
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
762
                               '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
763
        self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
2520.4.32 by Aaron Bentley
Fix test case
764
        self.assertContainsRe(self.get_raw(bundle_file), 'one')
765
        self.assertContainsRe(self.get_raw(bundle_file), 'three')
766
2520.4.75 by Aaron Bentley
Fix traceback on empty bundles.
767
    def test_bundle_same_basis(self):
768
        """Ensure using the basis as the target doesn't cause an error"""
769
        self.tree1 = self.make_branch_and_tree('b1')
770
        self.tree1.commit('add file', rev_id='a@cset-0-1')
771
        bundle_file = StringIO()
772
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
773
                               'a@cset-0-1', bundle_file)
774
2520.4.32 by Aaron Bentley
Fix test case
775
    @staticmethod
776
    def get_raw(bundle_file):
777
        return bundle_file.getvalue()
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
778
1711.7.35 by John Arbash Meinel
Factor out i18n bundle tests, so we don't always skip.
779
    def test_unicode_bundle(self):
780
        # Handle international characters
781
        os.mkdir('b1')
782
        try:
783
            f = open(u'b1/with Dod\xe9', 'wb')
784
        except UnicodeEncodeError:
785
            raise TestSkipped("Filesystem doesn't support unicode")
786
787
        self.tree1 = self.make_branch_and_tree('b1')
788
        self.b1 = self.tree1.branch
789
790
        f.write((u'A file\n'
791
            u'With international man of mystery\n'
792
            u'William Dod\xe9\n').encode('utf-8'))
793
        f.close()
794
2386.1.1 by John Arbash Meinel
Update test_unicode_bundle, since we know how it fails on Mac OSX
795
        self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
796
        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.
797
                          rev_id='i18n-1', committer=u'William Dod\xe9')
798
2386.1.1 by John Arbash Meinel
Update test_unicode_bundle, since we know how it fails on Mac OSX
799
        if sys.platform == 'darwin':
800
            # On Mac the '\xe9' gets changed to 'e\u0301'
801
            self.assertEqual([u'.bzr', u'with Dode\u0301'],
802
                             sorted(os.listdir(u'b1')))
803
            delta = self.tree1.changes_from(self.tree1.basis_tree())
804
            self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
805
                             delta.removed)
806
            self.knownFailure("Mac OSX doesn't preserve unicode"
807
                              " combining characters.")
808
1711.7.35 by John Arbash Meinel
Factor out i18n bundle tests, so we don't always skip.
809
        # Add
810
        bundle = self.get_valid_bundle(None, 'i18n-1')
811
812
        # Modified
813
        f = open(u'b1/with Dod\xe9', 'wb')
814
        f.write(u'Modified \xb5\n'.encode('utf8'))
815
        f.close()
816
        self.tree1.commit(u'modified', rev_id='i18n-2')
817
818
        bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
819
        
820
        # Renamed
821
        self.tree1.rename_one(u'with Dod\xe9', u'B\xe5gfors')
822
        self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
823
                          committer=u'Erik B\xe5gfors')
824
825
        bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
826
827
        # Removed
828
        self.tree1.remove([u'B\xe5gfors'])
829
        self.tree1.commit(u'removed', rev_id='i18n-4')
830
831
        bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
832
833
        # Rollup
834
        bundle = self.get_valid_bundle(None, 'i18n-4')
835
836
1711.7.34 by John Arbash Meinel
Include a test to ensure bundles handle trailing whitespace.
837
    def test_whitespace_bundle(self):
838
        if sys.platform in ('win32', 'cygwin'):
839
            raise TestSkipped('Windows doesn\'t support filenames'
840
                              ' with tabs or trailing spaces')
841
        self.tree1 = self.make_branch_and_tree('b1')
842
        self.b1 = self.tree1.branch
843
844
        self.build_tree(['b1/trailing space '])
845
        self.tree1.add(['trailing space '])
846
        # TODO: jam 20060701 Check for handling files with '\t' characters
847
        #       once we actually support them
848
849
        # Added
850
        self.tree1.commit('funky whitespace', rev_id='white-1')
851
852
        bundle = self.get_valid_bundle(None, 'white-1')
853
854
        # Modified
855
        open('b1/trailing space ', 'ab').write('add some text\n')
856
        self.tree1.commit('add text', rev_id='white-2')
857
858
        bundle = self.get_valid_bundle('white-1', 'white-2')
859
860
        # Renamed
861
        self.tree1.rename_one('trailing space ', ' start and end space ')
862
        self.tree1.commit('rename', rev_id='white-3')
863
864
        bundle = self.get_valid_bundle('white-2', 'white-3')
865
866
        # Removed
867
        self.tree1.remove([' start and end space '])
868
        self.tree1.commit('removed', rev_id='white-4')
869
870
        bundle = self.get_valid_bundle('white-3', 'white-4')
871
        
872
        # Now test a complet roll-up
873
        bundle = self.get_valid_bundle(None, 'white-4')
874
1793.3.9 by John Arbash Meinel
Add a test to timezone for non integer tz offsets
875
    def test_alt_timezone_bundle(self):
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
876
        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
877
        self.b1 = self.tree1.branch
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
878
        builder = treebuilder.TreeBuilder()
1793.3.9 by John Arbash Meinel
Add a test to timezone for non integer tz offsets
879
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
880
        self.tree1.lock_write()
881
        builder.start_tree(self.tree1)
882
        builder.build(['newfile'])
883
        builder.finish_tree()
1793.3.9 by John Arbash Meinel
Add a test to timezone for non integer tz offsets
884
885
        # Asia/Colombo offset = 5 hours 30 minutes
886
        self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
887
                          timezone=19800, timestamp=1152544886.0)
888
889
        bundle = self.get_valid_bundle(None, 'tz-1')
890
        
891
        rev = bundle.revisions[0]
892
        self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
893
        self.assertEqual(19800, rev.timezone)
894
        self.assertEqual(1152544886.0, rev.timestamp)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
895
        self.tree1.unlock()
1793.3.9 by John Arbash Meinel
Add a test to timezone for non integer tz offsets
896
1910.2.1 by Aaron Bentley
Ensure root entry always has a revision
897
    def test_bundle_root_id(self):
898
        self.tree1 = self.make_branch_and_tree('b1')
899
        self.b1 = self.tree1.branch
900
        self.tree1.commit('message', rev_id='revid1')
901
        bundle = self.get_valid_bundle(None, 'revid1')
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
902
        tree = self.get_bundle_tree(bundle, 'revid1')
1910.2.6 by Aaron Bentley
Update for merge review, handle deprecations
903
        self.assertEqual('revid1', tree.inventory.root.revision)
1910.2.1 by Aaron Bentley
Ensure root entry always has a revision
904
1551.14.9 by Aaron Bentley
rename get_target_revision to install_revisions
905
    def test_install_revisions(self):
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
906
        self.tree1 = self.make_branch_and_tree('b1')
907
        self.b1 = self.tree1.branch
908
        self.tree1.commit('message', rev_id='rev2a')
909
        bundle = self.get_valid_bundle(None, 'rev2a')
910
        branch2 = self.make_branch('b2')
911
        self.assertFalse(branch2.repository.has_revision('rev2a'))
1551.14.9 by Aaron Bentley
rename get_target_revision to install_revisions
912
        target_revision = bundle.install_revisions(branch2.repository)
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
913
        self.assertTrue(branch2.repository.has_revision('rev2a'))
1551.14.9 by Aaron Bentley
rename get_target_revision to install_revisions
914
        self.assertEqual('rev2a', target_revision)
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
915
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
916
    def test_bundle_empty_property(self):
917
        """Test serializing revision properties with an empty value."""
918
        tree = self.make_branch_and_memory_tree('tree')
919
        tree.lock_write()
920
        self.addCleanup(tree.unlock)
921
        tree.add([''], ['TREE_ROOT'])
922
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
923
        self.b1 = tree.branch
924
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
2520.4.33 by Aaron Bentley
remove test dependencies on serialization minutia
925
        bundle = read_bundle(bundle_sio)
926
        revision_info = bundle.revisions[0]
927
        self.assertEqual('rev1', revision_info.revision_id)
928
        rev = revision_info.as_revision()
929
        self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
930
                         rev.properties)
931
932
    def test_bundle_sorted_properties(self):
933
        """For stability the writer should write properties in sorted order."""
934
        tree = self.make_branch_and_memory_tree('tree')
935
        tree.lock_write()
936
        self.addCleanup(tree.unlock)
937
938
        tree.add([''], ['TREE_ROOT'])
939
        tree.commit('One', rev_id='rev1',
940
                    revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
941
        self.b1 = tree.branch
942
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
943
        bundle = read_bundle(bundle_sio)
944
        revision_info = bundle.revisions[0]
945
        self.assertEqual('rev1', revision_info.revision_id)
946
        rev = revision_info.as_revision()
947
        self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
948
                          'd':'1'}, rev.properties)
949
950
    def test_bundle_unicode_properties(self):
951
        """We should be able to round trip a non-ascii property."""
952
        tree = self.make_branch_and_memory_tree('tree')
953
        tree.lock_write()
954
        self.addCleanup(tree.unlock)
955
956
        tree.add([''], ['TREE_ROOT'])
957
        # Revisions themselves do not require anything about revision property
958
        # keys, other than that they are a basestring, and do not contain
959
        # whitespace.
960
        # However, Testaments assert than they are str(), and thus should not
961
        # be Unicode.
962
        tree.commit('One', rev_id='rev1',
963
                    revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
964
        self.b1 = tree.branch
965
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
966
        bundle = read_bundle(bundle_sio)
967
        revision_info = bundle.revisions[0]
968
        self.assertEqual('rev1', revision_info.revision_id)
969
        rev = revision_info.as_revision()
970
        self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
971
                          'alpha':u'\u03b1'}, rev.properties)
972
2520.4.43 by Aaron Bentley
Fix test suite
973
    def test_bundle_with_ghosts(self):
974
        tree = self.make_branch_and_tree('tree')
975
        self.b1 = tree.branch
976
        self.build_tree_contents([('tree/file', 'content1')])
977
        tree.add(['file'])
978
        tree.commit('rev1')
979
        self.build_tree_contents([('tree/file', 'content2')])
980
        tree.add_parent_tree_id('ghost')
981
        tree.commit('rev2', rev_id='rev2')
982
        bundle = self.get_valid_bundle(None, 'rev2')
983
2520.4.97 by Aaron Bentley
Hack in support for inventory conversion
984
    def make_simple_tree(self, format=None):
985
        tree = self.make_branch_and_tree('b1', format=format)
986
        self.b1 = tree.branch
987
        self.build_tree(['b1/file'])
988
        tree.add('file')
989
        return tree
990
991
    def test_across_serializers(self):
992
        tree = self.make_simple_tree('knit')
993
        tree.commit('hello', rev_id='rev1')
2520.4.98 by Aaron Bentley
Support inventory conversion with parents
994
        tree.commit('hello', rev_id='rev2')
995
        bundle = read_bundle(self.create_bundle_text(None, 'rev2')[0])
2520.4.97 by Aaron Bentley
Hack in support for inventory conversion
996
        repo = self.make_repository('repo', format='dirstate-with-subtree')
997
        bundle.install_revisions(repo)
2520.4.98 by Aaron Bentley
Support inventory conversion with parents
998
        inv_text = repo.get_inventory_xml('rev2')
2520.4.97 by Aaron Bentley
Hack in support for inventory conversion
999
        self.assertNotContainsRe(inv_text, 'format="5"')
2520.4.99 by Aaron Bentley
Test conversion across models
1000
        self.assertContainsRe(inv_text, 'format="7"')
1001
1002
    def test_across_models(self):
1003
        tree = self.make_simple_tree('knit')
1004
        tree.commit('hello', rev_id='rev1')
1005
        tree.commit('hello', rev_id='rev2')
1006
        bundle = read_bundle(self.create_bundle_text(None, 'rev2')[0])
1007
        repo = self.make_repository('repo', format='dirstate-with-subtree')
1008
        bundle.install_revisions(repo)
1009
        inv = repo.get_inventory('rev2')
1010
        self.assertEqual('rev2', inv.root.revision)
1011
        root_vf = repo.weave_store.get_weave(inv.root.file_id,
1012
                                             repo.get_transaction())
1013
        self.assertEqual(root_vf.versions(), ['rev1', 'rev2'])
1014
1015
    def test_across_models_incompatible(self):
1016
        tree = self.make_simple_tree('dirstate-with-subtree')
1017
        tree.commit('hello', rev_id='rev1')
1018
        tree.commit('hello', rev_id='rev2')
1019
        try:
1020
            bundle = read_bundle(self.create_bundle_text(None, 'rev1')[0])
1021
        except errors.IncompatibleBundleFormat:
1022
            raise TestSkipped("Format 0.8 doesn't work with knit3")
1023
        repo = self.make_repository('repo', format='knit')
1024
        bundle.install_revisions(repo)
1025
1026
        bundle = read_bundle(self.create_bundle_text(None, 'rev2')[0])
1027
        self.assertRaises(errors.IncompatibleRevision,
1028
                          bundle.install_revisions, repo)
2520.4.97 by Aaron Bentley
Hack in support for inventory conversion
1029
2520.4.43 by Aaron Bentley
Fix test suite
1030
1031
class V08BundleTester(BundleTester, TestCaseWithTransport):
2520.4.33 by Aaron Bentley
remove test dependencies on serialization minutia
1032
1033
    format = '0.8'
1034
1035
    def test_bundle_empty_property(self):
1036
        """Test serializing revision properties with an empty value."""
1037
        tree = self.make_branch_and_memory_tree('tree')
1038
        tree.lock_write()
1039
        self.addCleanup(tree.unlock)
1040
        tree.add([''], ['TREE_ROOT'])
1041
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1042
        self.b1 = tree.branch
1043
        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'.
1044
        self.assertContainsRe(bundle_sio.getvalue(),
1045
                              '# properties:\n'
1046
                              '#   branch-nick: tree\n'
2447.1.3 by John Arbash Meinel
Change the default serializer to include a trailing whitespace for empty properties.
1047
                              '#   empty: \n'
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
1048
                              '#   one: two\n'
1049
                             )
1050
        bundle = read_bundle(bundle_sio)
1051
        revision_info = bundle.revisions[0]
1052
        self.assertEqual('rev1', revision_info.revision_id)
1053
        rev = revision_info.as_revision()
1054
        self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1055
                         rev.properties)
1056
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1057
    def get_bundle_tree(self, bundle, revision_id):
1058
        repository = self.make_repository('repo')
1059
        return bundle.revision_tree(repository, 'revid1')
1060
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
1061
    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.
1062
        """Test serializing revision properties with an empty value.
1063
1064
        Older readers had a bug when reading an empty property.
1065
        They assumed that all keys ended in ': \n'. However they would write an
1066
        empty value as ':\n'. This tests make sure that all newer bzr versions
1067
        can handle th second form.
1068
        """
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
1069
        tree = self.make_branch_and_memory_tree('tree')
1070
        tree.lock_write()
1071
        self.addCleanup(tree.unlock)
1072
        tree.add([''], ['TREE_ROOT'])
1073
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1074
        self.b1 = tree.branch
1075
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
1076
        txt = bundle_sio.getvalue()
2447.1.3 by John Arbash Meinel
Change the default serializer to include a trailing whitespace for empty properties.
1077
        loc = txt.find('#   empty: ') + len('#   empty:')
1078
        # Create a new bundle, which strips the trailing space after empty
1079
        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'.
1080
1081
        self.assertContainsRe(bundle_sio.getvalue(),
1082
                              '# properties:\n'
1083
                              '#   branch-nick: tree\n'
2447.1.3 by John Arbash Meinel
Change the default serializer to include a trailing whitespace for empty properties.
1084
                              '#   empty:\n'
2447.1.2 by John Arbash Meinel
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
1085
                              '#   one: two\n'
1086
                             )
1087
        bundle = read_bundle(bundle_sio)
1088
        revision_info = bundle.revisions[0]
1089
        self.assertEqual('rev1', revision_info.revision_id)
1090
        rev = revision_info.as_revision()
1091
        self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1092
                         rev.properties)
1093
2447.1.1 by John Arbash Meinel
For stability and ease of testing, write properties in sorted order.
1094
    def test_bundle_sorted_properties(self):
1095
        """For stability the writer should write properties in sorted order."""
1096
        tree = self.make_branch_and_memory_tree('tree')
1097
        tree.lock_write()
1098
        self.addCleanup(tree.unlock)
1099
1100
        tree.add([''], ['TREE_ROOT'])
1101
        tree.commit('One', rev_id='rev1',
1102
                    revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1103
        self.b1 = tree.branch
1104
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
1105
        self.assertContainsRe(bundle_sio.getvalue(),
1106
                              '# properties:\n'
1107
                              '#   a: 4\n'
1108
                              '#   b: 3\n'
1109
                              '#   branch-nick: tree\n'
1110
                              '#   c: 2\n'
1111
                              '#   d: 1\n'
1112
                             )
2447.1.4 by John Arbash Meinel
Add a test that we properly round-trip unicode properties.
1113
        bundle = read_bundle(bundle_sio)
1114
        revision_info = bundle.revisions[0]
1115
        self.assertEqual('rev1', revision_info.revision_id)
1116
        rev = revision_info.as_revision()
1117
        self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1118
                          'd':'1'}, rev.properties)
1119
1120
    def test_bundle_unicode_properties(self):
1121
        """We should be able to round trip a non-ascii property."""
1122
        tree = self.make_branch_and_memory_tree('tree')
1123
        tree.lock_write()
1124
        self.addCleanup(tree.unlock)
1125
1126
        tree.add([''], ['TREE_ROOT'])
1127
        # Revisions themselves do not require anything about revision property
1128
        # keys, other than that they are a basestring, and do not contain
1129
        # whitespace.
1130
        # However, Testaments assert than they are str(), and thus should not
1131
        # be Unicode.
1132
        tree.commit('One', rev_id='rev1',
1133
                    revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1134
        self.b1 = tree.branch
1135
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
1136
        self.assertContainsRe(bundle_sio.getvalue(),
1137
                              '# properties:\n'
1138
                              '#   alpha: \xce\xb1\n'
1139
                              '#   branch-nick: tree\n'
1140
                              '#   omega: \xce\xa9\n'
1141
                             )
1142
        bundle = read_bundle(bundle_sio)
1143
        revision_info = bundle.revisions[0]
1144
        self.assertEqual('rev1', revision_info.revision_id)
1145
        rev = revision_info.as_revision()
1146
        self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1147
                          'alpha':u'\u03b1'}, rev.properties)
2447.1.1 by John Arbash Meinel
For stability and ease of testing, write properties in sorted order.
1148
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1149
1910.2.59 by Aaron Bentley
Test 0.9 bundles for knit format1 and knit format2
1150
class V09BundleKnit2Tester(V08BundleTester):
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
1151
1152
    format = '0.9'
1153
1154
    def bzrdir_format(self):
1155
        format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
1156
        format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
1157
        return format
1158
1159
1910.2.59 by Aaron Bentley
Test 0.9 bundles for knit format1 and knit format2
1160
class V09BundleKnit1Tester(V08BundleTester):
1161
1162
    format = '0.9'
1163
1164
    def bzrdir_format(self):
1165
        format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
1166
        format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.59 by Aaron Bentley
Test 0.9 bundles for knit format1 and knit format2
1167
        return format
1168
1169
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1170
class V4BundleTester(BundleTester, TestCaseWithTransport):
2520.4.14 by Aaron Bentley
Get most tests passing, use format header
1171
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1172
    format = '4alpha'
2520.4.14 by Aaron Bentley
Get most tests passing, use format header
1173
1174
    def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1175
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
1176
        Make sure that the text generated is valid, and that it
1177
        can be applied against the base, and generate the same information.
1178
        
1179
        :return: The in-memory bundle 
1180
        """
1181
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1182
1183
        # This should also validate the generated bundle 
1184
        bundle = read_bundle(bundle_txt)
1185
        repository = self.b1.repository
1186
        for bundle_rev in bundle.real_revisions:
1187
            # These really should have already been checked when we read the
1188
            # bundle, since it computes the sha1 hash for the revision, which
1189
            # only will match if everything is okay, but lets be explicit about
1190
            # it
1191
            branch_rev = repository.get_revision(bundle_rev.revision_id)
1192
            for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1193
                      'timestamp', 'timezone', 'message', 'committer', 
1194
                      'parent_ids', 'properties'):
1195
                self.assertEqual(getattr(branch_rev, a), 
1196
                                 getattr(bundle_rev, a))
1197
            self.assertEqual(len(branch_rev.parent_ids), 
1198
                             len(bundle_rev.parent_ids))
2520.4.29 by Aaron Bentley
Reactivate some testing, fix topo_iter
1199
        self.assertEqual(set(rev_ids),
1200
                         set([r.revision_id for r in bundle.real_revisions]))
2520.4.14 by Aaron Bentley
Get most tests passing, use format header
1201
        self.valid_apply_bundle(base_rev_id, bundle,
1202
                                   checkout_dir=checkout_dir)
1203
1204
        return bundle
1205
2520.4.34 by Aaron Bentley
Add signature support
1206
    def get_invalid_bundle(self, base_rev_id, rev_id):
1207
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
1208
        Munge the text so that it's invalid.
1209
1210
        :return: The in-memory bundle
1211
        """
1212
        from bzrlib.bundle import serializer
1213
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1214
        new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1215
        new_text = new_text.replace('<file file_id="exe-1"',
1216
                                    '<file executable="y" file_id="exe-1"')
2520.4.84 by Aaron Bentley
Fix heisenbug record-rewriting test
1217
        new_text = new_text.replace('B372', 'B387')
2520.4.34 by Aaron Bentley
Add signature support
1218
        bundle_txt = StringIO()
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1219
        bundle_txt.write(serializer._get_bundle_header('4alpha'))
2520.4.34 by Aaron Bentley
Add signature support
1220
        bundle_txt.write('\n')
2520.4.76 by Aaron Bentley
Move base64-encoding into merge directives
1221
        bundle_txt.write(new_text.encode('bz2'))
2520.4.34 by Aaron Bentley
Add signature support
1222
        bundle_txt.seek(0)
1223
        bundle = read_bundle(bundle_txt)
1224
        self.valid_apply_bundle(base_rev_id, bundle)
1225
        return bundle
1226
2520.4.14 by Aaron Bentley
Get most tests passing, use format header
1227
    def create_bundle_text(self, base_rev_id, rev_id):
1228
        bundle_txt = StringIO()
1229
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id, 
1230
                               bundle_txt, format=self.format)
1231
        bundle_txt.seek(0)
1232
        self.assertEqual(bundle_txt.readline(), 
1233
                         '# Bazaar revision bundle v%s\n' % self.format)
1234
        self.assertEqual(bundle_txt.readline(), '#\n')
1235
        rev = self.b1.repository.get_revision(rev_id)
1236
        bundle_txt.seek(0)
1237
        return bundle_txt, rev_ids
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1238
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1239
    def get_bundle_tree(self, bundle, revision_id):
1240
        repository = self.make_repository('repo')
1241
        bundle.install_revisions(repository)
1242
        return repository.revision_tree(revision_id)
1243
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1244
    def test_creation(self):
1245
        tree = self.make_branch_and_tree('tree')
2520.4.8 by Aaron Bentley
Serialize inventory
1246
        self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
2520.4.6 by Aaron Bentley
Get installation started
1247
        tree.add('file', 'fileid-2')
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1248
        tree.commit('added file', rev_id='rev1')
2520.4.8 by Aaron Bentley
Serialize inventory
1249
        self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
2520.4.10 by Aaron Bentley
Enable installation of revisions
1250
        tree.commit('changed file', rev_id='rev2')
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1251
        s = StringIO()
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1252
        serializer = BundleSerializerV4('1.0')
2520.4.8 by Aaron Bentley
Serialize inventory
1253
        serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
2520.4.5 by Aaron Bentley
Start work on reading mpbundles
1254
        s.seek(0)
2520.4.6 by Aaron Bentley
Get installation started
1255
        tree2 = self.make_branch_and_tree('target')
1256
        target_repo = tree2.branch.repository
1257
        install_bundle(target_repo, serializer.read(s))
1258
        vf = target_repo.weave_store.get_weave('fileid-2',
1259
            target_repo.get_transaction())
2520.4.8 by Aaron Bentley
Serialize inventory
1260
        self.assertEqual('contents1\nstatic\n', vf.get_text('rev1'))
1261
        self.assertEqual('contents2\nstatic\n', vf.get_text('rev2'))
1262
        rtree = target_repo.revision_tree('rev2')
2520.4.9 by Aaron Bentley
Test inventory_vf parents
1263
        inventory_vf = target_repo.get_inventory_weave()
1264
        self.assertEqual(['rev1'], inventory_vf.get_parents('rev2'))
2520.4.10 by Aaron Bentley
Enable installation of revisions
1265
        self.assertEqual('changed file',
1266
                         target_repo.get_revision('rev2').message)
2520.4.6 by Aaron Bentley
Get installation started
1267
2520.4.32 by Aaron Bentley
Fix test case
1268
    @staticmethod
1269
    def get_raw(bundle_file):
1270
        bundle_file.seek(0)
2520.4.70 by Aaron Bentley
Yank patch-handling functionality
1271
        line = bundle_file.readline()
1272
        line = bundle_file.readline()
2520.4.32 by Aaron Bentley
Fix test case
1273
        lines = bundle_file.readlines()
2520.4.76 by Aaron Bentley
Move base64-encoding into merge directives
1274
        return ''.join(lines).decode('bz2')
2520.4.32 by Aaron Bentley
Fix test case
1275
2520.4.34 by Aaron Bentley
Add signature support
1276
    def test_copy_signatures(self):
1277
        tree_a = self.make_branch_and_tree('tree_a')
1278
        import bzrlib.gpg
1279
        import bzrlib.commit as commit
1280
        oldstrategy = bzrlib.gpg.GPGStrategy
1281
        branch = tree_a.branch
1282
        repo_a = branch.repository
1283
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1284
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
1285
        try:
1286
            from bzrlib.testament import Testament
1287
            # monkey patch gpg signing mechanism
1288
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1289
            new_config = test_commit.MustSignConfig(branch)
1290
            commit.Commit(config=new_config).commit(message="base",
1291
                                                    allow_pointless=True,
1292
                                                    rev_id='B',
1293
                                                    working_tree=tree_a)
1294
            def sign(text):
1295
                return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1296
            self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1297
        finally:
1298
            bzrlib.gpg.GPGStrategy = oldstrategy
1299
        tree_b = self.make_branch_and_tree('tree_b')
1300
        repo_b = tree_b.branch.repository
1301
        s = StringIO()
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1302
        serializer = BundleSerializerV4('4alpha')
2520.4.34 by Aaron Bentley
Add signature support
1303
        serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1304
        s.seek(0)
1305
        install_bundle(repo_b, serializer.read(s))
1306
        self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1307
        self.assertEqual(repo_b.get_signature_text('B'),
1308
                         repo_a.get_signature_text('B'))
1309
2520.4.4 by Aaron Bentley
Get basis support for a new bundle format in place
1310
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
1311
class V4WeaveBundleTester(V4BundleTester):
1312
1313
    def bzrdir_format(self):
2520.4.91 by Aaron Bentley
Okay, so I meant metaweave. I think.
1314
        return 'metaweave'
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
1315
1316
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1317
class MungedBundleTester(object):
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1318
1319
    def build_test_bundle(self):
1320
        wt = self.make_branch_and_tree('b1')
1321
1322
        self.build_tree(['b1/one'])
1323
        wt.add('one')
1324
        wt.commit('add one', rev_id='a@cset-0-1')
1325
        self.build_tree(['b1/two'])
1326
        wt.add('two')
1793.3.14 by John Arbash Meinel
Actually fix the bug with missing trailing newline bug #49182
1327
        wt.commit('add two', rev_id='a@cset-0-2',
1328
                  revprops={'branch-nick':'test'})
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1329
1330
        bundle_txt = StringIO()
1331
        rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1332
                               'a@cset-0-1', bundle_txt, self.format)
1333
        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
1334
        bundle_txt.seek(0, 0)
1335
        return bundle_txt
1336
1337
    def check_valid(self, bundle):
1338
        """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
1339
        self.assertEqual(['a@cset-0-2'],
1793.3.4 by John Arbash Meinel
[merge] bzr.dev 1804 and fix conflicts.
1340
            [r.revision_id for r in bundle.real_revisions])
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1341
1342
    def test_extra_whitespace(self):
1343
        bundle_txt = self.build_test_bundle()
1344
1345
        # Seek to the end of the file
1346
        # Adding one extra newline used to give us
1347
        # TypeError: float() argument must be a string or a number
1348
        bundle_txt.seek(0, 2)
1349
        bundle_txt.write('\n')
1350
        bundle_txt.seek(0)
1351
1793.3.4 by John Arbash Meinel
[merge] bzr.dev 1804 and fix conflicts.
1352
        bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1353
        self.check_valid(bundle)
1354
1355
    def test_extra_whitespace_2(self):
1356
        bundle_txt = self.build_test_bundle()
1357
1358
        # Seek to the end of the file
1359
        # Adding two extra newlines used to give us
1360
        # MalformedPatches: The first line of all patches should be ...
1361
        bundle_txt.seek(0, 2)
1362
        bundle_txt.write('\n\n')
1363
        bundle_txt.seek(0)
1364
1793.3.4 by John Arbash Meinel
[merge] bzr.dev 1804 and fix conflicts.
1365
        bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1366
        self.check_valid(bundle)
1367
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1368
1369
class MungedBundleTesterV09(TestCaseWithTransport, MungedBundleTester):
1370
1371
    format = '0.9'
1372
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1373
    def test_missing_trailing_whitespace(self):
1374
        bundle_txt = self.build_test_bundle()
1375
1376
        # Remove a trailing newline, it shouldn't kill the parser
1377
        raw = bundle_txt.getvalue()
1378
        # The contents of the bundle don't have to be this, but this
1379
        # test is concerned with the exact case where the serializer
1380
        # creates a blank line at the end, and fails if that
1381
        # line is stripped
1382
        self.assertEqual('\n\n', raw[-2:])
1793.3.14 by John Arbash Meinel
Actually fix the bug with missing trailing newline bug #49182
1383
        bundle_txt = StringIO(raw[:-1])
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1384
1793.3.4 by John Arbash Meinel
[merge] bzr.dev 1804 and fix conflicts.
1385
        bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel
(failing) add some tests which munge trailing whitespace
1386
        self.check_valid(bundle)
1793.3.14 by John Arbash Meinel
Actually fix the bug with missing trailing newline bug #49182
1387
1793.3.16 by John Arbash Meinel
Add tests to ensure that we gracefully handle opening and trailing non-bundle text.
1388
    def test_opening_text(self):
1389
        bundle_txt = self.build_test_bundle()
1390
1391
        bundle_txt = StringIO("Some random\nemail comments\n"
1392
                              + bundle_txt.getvalue())
1393
1394
        bundle = read_bundle(bundle_txt)
1395
        self.check_valid(bundle)
1396
1397
    def test_trailing_text(self):
1398
        bundle_txt = self.build_test_bundle()
1399
1400
        bundle_txt = StringIO(bundle_txt.getvalue() +
1401
                              "Some trailing\nrandom\ntext\n")
1402
1403
        bundle = read_bundle(bundle_txt)
1404
        self.check_valid(bundle)
2520.4.56 by Aaron Bentley
Begin adding support for arbitrary metadata
1405
1406
2520.4.79 by Aaron Bentley
Fixed up not-really-relevant munging tests
1407
class MungedBundleTesterV4(TestCaseWithTransport, MungedBundleTester):
1408
1409
    format = '4alpha'
1410
1411
2520.4.56 by Aaron Bentley
Begin adding support for arbitrary metadata
1412
class TestBundleWriterReader(TestCase):
1413
1414
    def test_roundtrip_record(self):
1415
        fileobj = StringIO()
2520.4.72 by Aaron Bentley
Rename format to 4alpha
1416
        writer = v4.BundleWriter(fileobj)
2520.4.56 by Aaron Bentley
Begin adding support for arbitrary metadata
1417
        writer.begin()
2520.4.95 by Aaron Bentley
Add support for header/info records
1418
        writer.add_info_record(foo='bar')
1419
        writer._add_record("Record body", {'parents': ['1', '3'],
1420
            'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
2520.4.56 by Aaron Bentley
Begin adding support for arbitrary metadata
1421
        writer.end()
1422
        fileobj.seek(0)
2520.4.95 by Aaron Bentley
Add support for header/info records
1423
        record_iter = v4.BundleReader(fileobj).iter_records()
1424
        record = record_iter.next()
1425
        self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1426
            'info', None, None), record)
1427
        record = record_iter.next()
1428
        self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1429
                          'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1430
                          record)
1431
1432
    def test_name_encode(self):
1433
        self.assertEqual('revision/rev1',
1434
            v4.BundleWriter.encode_name('revision', 'rev1'))
1435
        self.assertEqual('file/rev1/file-id-1',
1436
            v4.BundleWriter.encode_name('file', 'rev1', 'file-id-1'))
1437
        self.assertEqual('info',
1438
            v4.BundleWriter.encode_name('info', None, None))
1439
1440
    def test_name_decode(self):
1441
        self.assertEqual(('revision', 'rev1', None),
1442
            v4.BundleReader.decode_name('revision/rev1'))
1443
        self.assertEqual(('file', 'rev1', 'file-id-1'),
1444
            v4.BundleReader.decode_name('file/rev1/file-id-1'))
1445
        self.assertEqual(('info', None, None),
1446
                         v4.BundleReader.decode_name('info'))