1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
|
# Copyright (C) 2005 Canonical Limited
# Authors: Robert Collins <robert.collins@canonical.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from bzrlib.tests import TestCaseInTempDir, TestCase
from bzrlib import repository
from bzrlib.osutils import has_symlinks
try:
import pybaz
except ImportError:
pybaz = None
import os
from bzrlib.plugins.bzrtools import cmd_baz_import
from bzrlib.plugins.bzrtools.baz_import import (import_version,
revision_id,
make_archive,
map_file_id)
import shutil
from StringIO import StringIO
import tempfile
from testresources import (TestResource, TestLoader, OptimisingTestSuite,
ResourcedTestCase)
import bzrlib
from bzrlib.errors import NoSuchRevision
from bzrlib.plugins.bzrtools.fai import namespace_previous
from bzrlib.branch import Branch
def test_suite():
if pybaz is None:
from unittest import TestSuite
return TestSuite()
return TestLoader().loadTestsFromName(__name__)
class BazTreeResource(TestResource):
def cleanUp(self):
os.environ['HOME'] = self._oldhome
shutil.rmtree(self._tmpdir)
def __init__(self):
self._tmpdir = tempfile.mkdtemp()
self._homedir = os.path.join(self._tmpdir, 'home')
self._oldhome = os.environ['HOME']
os.mkdir(self._homedir)
os.environ['HOME'] = self._homedir
self._archiveroot = os.path.join(self._tmpdir, 'archive')
self._archive = make_archive('demo@DONOTUSE', str(self._archiveroot))
pybaz.set_my_id("Test User<test@example.org>")
self.make_empty_import()
self.make_utf8_log()
self._empty_tag = 'demo@DONOTUSE/c--empty-tag--0'
self._empty_tag_bzr = revision_id(self._empty_tag + '--base-0', None)
pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(
pybaz.Version(self._empty_tag))
self._empty_merged_tag = 'demo@DONOTUSE/c--empty-merged-tag--0'
self._empty_merged_tag_bzr_base = revision_id(self._empty_merged_tag
+ '--base-0', None)
self._empty_merged_tag_bzr = revision_id(self._empty_merged_tag
+ '--patch-1', None)
pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(
pybaz.Version(self._empty_merged_tag))
tree = pybaz.Revision(self._empty_merged_tag + '--base-0').get(
os.path.join(self._tmpdir, 'tree'))
tree.star_merge(self._empty_tag,
pybaz.Version('demo@DONOTUSE/c--import--0'))
msg = tree.log_message()
msg["summary"]="did a merge, yarh"
tree.commit(msg)
shutil.rmtree(os.path.join(self._tmpdir, 'tree'))
# tree, two commits, includes merge of other branch
self._empty_merged_tag_2 = 'demo@DONOTUSE/c--empty-tag-2--0'
self._empty_merged_tag_2_bzr_base = revision_id(
self._empty_merged_tag_2 + '--base-0', None)
self._empty_merged_tag_2_bzr = revision_id(
self._empty_merged_tag_2 + '--patch-1', None)
pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(
pybaz.Version(self._empty_merged_tag_2))
tree = pybaz.Revision(self._empty_merged_tag_2 + '--base-0').get (
os.path.join(self._tmpdir, 'tree'))
tree.star_merge(self._empty_merged_tag,
pybaz.Version('demo@DONOTUSE/c--import--0'))
msg = tree.log_message()
msg["summary"] = "merge in a merged tree."
tree.commit(msg)
shutil.rmtree(os.path.join(self._tmpdir, 'tree'))
self._bad_id_tag = 'demo@DONOTUSE/c--bad-id--0'
self._bad_id_tag_bzr_base = revision_id(self._bad_id_tag + '--base-0',
None)
self._bad_id_tag_bzr = revision_id(self._bad_id_tag + '--patch-1',
None)
pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(
pybaz.Version(self._bad_id_tag))
tree = pybaz.Revision(self._bad_id_tag + '--base-0').get(
os.path.join(self._tmpdir, 'tree'))
from bzrlib.plugins.bzrtools.baz_import import add_file
add_file(os.path.join(self._tmpdir,'tree/path'), 'text',
'this_id/needs%escaping')
msg = tree.log_message()
msg["summary"] = "commit something which needs escaping."
tree.commit(msg)
shutil.rmtree(os.path.join(self._tmpdir, 'tree'))
self.make_import_symlink()
self.make_missing_ancestor()
self.make_inbranch_continuation()
def make_import_symlink(self):
self._import_symlink = 'demo@DONOTUSE/c--import-symlink--0'
self._import_symlink_bzr = revision_id(
self._import_symlink + '--base-0', None)
os.mkdir(os.path.join(self._tmpdir, 'tree'))
tree = pybaz.init_tree(os.path.join(self._tmpdir, 'tree'),
self._import_symlink)
link_path = os.path.join(self._tmpdir, 'tree', 'alink')
os.symlink('missing-file-name', link_path)
tree.add_tag('alink')
id_file = open(os.path.join(tree, '.arch-ids', 'alink.id'), 'w')
id_file.write('symlink_tag\n')
id_file.close()
msg = tree.log_message()
msg["summary"] = "Import with a symlink"
tree.import_(msg)
os.unlink(link_path)
f = file(link_path, 'w')
f.write('Not a symlink no more!')
f.close()
msg = tree.log_message()
msg["summary"] = "Turn a symlink into a file"
tree.commit(msg)
shutil.rmtree(os.path.join(self._tmpdir, 'tree'))
def make_empty_import(self):
self._import = 'demo@DONOTUSE/c--import--0'
os.mkdir(os.path.join(self._tmpdir, 'tree'))
tree = pybaz.init_tree(os.path.join(self._tmpdir, 'tree'),
self._import)
msg = tree.log_message()
msg["summary"] = "I am importing now"
tree.import_(msg)
shutil.rmtree(os.path.join(self._tmpdir, 'tree'))
def make_utf8_log(self):
self._utf8 = 'demo@DONOTUSE/c--utf8--0'
os.mkdir(os.path.join(self._tmpdir, 'tree'))
tree = pybaz.init_tree(os.path.join(self._tmpdir, 'tree'),
self._utf8)
msg = tree.log_message()
msg["summary"] = u"I am importing now\u1234".encode('utf-8')
tree.import_(msg)
shutil.rmtree(os.path.join(self._tmpdir, 'tree'))
def make_missing_ancestor(self):
self._archivegoneroot = os.path.join(self._tmpdir, 'archivegone')
self._archive = make_archive('demo-gone@DONOTUSE',
str(self._archivegoneroot))
self._missing_import = 'demo-gone@DONOTUSE/c--import--0'
self._missing_import_bzr = revision_id(self._missing_import
+ '--base-0', None)
self._missing_ancestor = 'demo@DONOTUSE/c--gone--0'
self._missing_ancestor_bzr = revision_id(self._missing_ancestor
+ '--base-0', None)
os.mkdir(os.path.join(self._tmpdir, 'tree'))
tree = pybaz.init_tree(os.path.join(self._tmpdir, 'tree'),
self._missing_import)
msg = tree.log_message()
msg["summary"] = "I am importing now"
tree.import_(msg)
shutil.rmtree(os.path.join(self._tmpdir, 'tree'))
# tag into the kept archive
pybaz.Revision(self._missing_import + '--base-0').make_continuation(
pybaz.Version(self._missing_ancestor))
# make an import for testing history-reuse logic.
# note the use of a namespace layout here.
self._missing_import_imported = os.path.join(self._tmpdir,
'archivegone-bzr')
os.mkdir(os.path.join(self._tmpdir, 'archivegone-bzr'))
os.mkdir(os.path.join(self._tmpdir, 'archivegone-bzr', 'c'))
import_version(os.path.join(self._tmpdir, 'archivegone-bzr',
'c', 'import'),
pybaz.Version(self._missing_import), None)
# and make it inaccessible
pybaz.Archive('demo-gone@DONOTUSE').unregister()
def make_inbranch_continuation(self):
self._inbranch_tag = 'demo@DONOTUSE/c--inbranch-tag--0'
self._inbranch_tag_base = self._inbranch_tag + '--base-0'
self._inbranch_tag_base_bzr = revision_id(self._inbranch_tag_base,
None)
pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(
pybaz.Version(self._inbranch_tag))
self._inbranch_tag_head = self._inbranch_tag + '--patch-1'
self._inbranch_tag_head_bzr = revision_id(self._inbranch_tag_head,
None)
pybaz.Revision(self._inbranch_tag_base).make_continuation(
pybaz.Version(self._inbranch_tag))
@classmethod
def _makeResource(self):
return BazTreeResource()
@classmethod
def _cleanResource(self, resource):
resource.cleanUp()
class TestImportBranch(TestCaseInTempDir):
_resources = [("_baz", BazTreeResource)]
def setUp(self):
TestCaseInTempDir.setUp(self)
ResourcedTestCase.setUpResources(self)
os.environ['HOME'] = self._baz._homedir
def tearDown(self):
ResourcedTestCase.tearDownResources(self)
TestCaseInTempDir.tearDown(self)
def test_import_utf8(self):
import_version('output', pybaz.Version(self._baz._utf8), None)
branch = Branch.open('output')
plain_revid = 'Arch-1:demo@DONOTUSE%c--utf8--0--base-0'
self.assertEqual([plain_revid], branch.revision_history())
self.assertEqual(u'I am importing now\ufffd\ufffd\ufffd',
branch.repository.get_revision(plain_revid).message)
import_version('output2', pybaz.Version(self._baz._utf8), 'utf-8')
branch2 = Branch.open('output2')
utf8_revid = 'Arch-1-utf-8:demo@DONOTUSE%c--utf8--0--base-0'
self.assertEqual([utf8_revid], branch2.revision_history())
self.assertEqual(u'I am importing now\u1234',
branch2.repository.get_revision(utf8_revid).message)
def test_import_empty(self):
import_version('output', pybaz.Version(self._baz._import), None)
# expected results:
# one commit, no files, revision identifier of
# 'demo@DONOTUSE_c--import--0--base-0'
branch = Branch.open('output')
repo = branch.repository
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0'])
rev = repo.get_revision('Arch-1:demo@DONOTUSE%c--import--0--base-0')
# and again.
import_version('output2', pybaz.Version('demo@DONOTUSE/c--import--0'),
None)
branch2 = Branch.open('output2')
repo2 = branch2.repository
self.assertEqual(branch.revision_history(), branch2.revision_history())
rev2 = repo2.get_revision('Arch-1:demo@DONOTUSE%c--import--0--base-0')
# they must be the same
self.assertEqual(rev, rev2)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message, "I am importing now")
self.assertEqual(rev.revision_id,
"Arch-1:demo@DONOTUSE%c--import--0--base-0")
def test_empty_tagged(self):
import_version('output', pybaz.Version(self._baz._empty_tag), None)
# expected results:
# two commits, no files, revision identifiers of
# 'demo@DONOTUSE_c--import--0--base-0' and
# self._baz._empty_tag_bzr
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0',
self._baz._empty_tag_bzr])
rev = branch.repository.get_revision(self._baz._empty_tag_bzr)
# and again.
import_version('output2', pybaz.Version(self._baz._empty_tag), None)
branch2 = Branch.open('output2')
self.assertEqual(branch.revision_history(), branch2.revision_history())
rev2 = branch2.repository.get_revision(self._baz._empty_tag_bzr)
# they must be the same
self.assertEqual(rev, rev2)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message,
"tag of demo@DONOTUSE/c--import--0--base-0")
self.assertEqual(rev.revision_id, self._baz._empty_tag_bzr)
def test_empty_merged_tagged(self):
import_version('output', pybaz.Version(self._baz._empty_merged_tag),
None)
# expected results:
# two commits, no files, revision identifiers of
# 'demo@DONOTUSE_c--import--0--base-0' and
# self._baz._empty_merged_tag_bzr_base
# self._baz._empty_merged_tag_bzr
# and a merged revision from the latter of
# self._baz._empty_tag_bzr
branch = Branch.open('output')
repo = branch.repository
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0',
self._baz._empty_merged_tag_bzr_base,
self._baz._empty_merged_tag_bzr])
# and again.
import_version('output2', pybaz.Version(self._baz._empty_merged_tag),
None)
branch2 = Branch.open('output2')
repo2 = branch2.repository
# and import what we should be merged up against for checking with.
import_version('output3', pybaz.Version(self._baz._empty_tag), None)
branch3 = Branch.open('output3')
self.assertEqual(branch.revision_history(), branch2.revision_history())
self.assertNotEqual(branch.revision_history(),
branch3.revision_history())
# check revisions in the history.
rev = repo.get_revision(self._baz._empty_merged_tag_bzr_base)
rev2 = repo2.get_revision(self._baz._empty_merged_tag_bzr_base)
# they must be the same
self.assertEqual(rev, rev2)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message,
"tag of demo@DONOTUSE/c--import--0--base-0")
self.assertEqual(rev.revision_id, self._baz._empty_merged_tag_bzr_base)
self.assertEqual(['Arch-1:demo@DONOTUSE%c--import--0--base-0'],
rev.parent_ids)
# check next revisions in the history.
rev = repo.get_revision(self._baz._empty_merged_tag_bzr)
rev2 = repo2.get_revision(self._baz._empty_merged_tag_bzr)
# they must be the same
self.assertEqual(rev, rev2)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message, "did a merge, yarh")
self.assertEqual(rev.revision_id, self._baz._empty_merged_tag_bzr)
self.assertEqual(rev.parent_ids[0],
self._baz._empty_merged_tag_bzr_base)
self.assertEqual(rev.parent_ids[1], self._baz._empty_tag_bzr)
# this tree should have nothing missing from that tree.
# FIXME there is no code for this right now.
# self.assertEqual(branch.missing_revisions(branch3), [])
def test_merge_branch_with_merges(self):
import_version('output', pybaz.Version(self._baz._empty_merged_tag_2),
None)
# expected results:
# two commits, no files, revision identifiers of
# 'demo@DONOTUSE_c--import--0--base-0' and
# self._baz._empty_merged_tag_2_bzr_base
# self._baz._empty_merged_tag_2_bzr
# and a merged revision from the latter of
# self._baz._empty_merged_tag_bzr
branch = Branch.open('output')
repo = branch.repository
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0',
self._baz._empty_merged_tag_2_bzr_base,
self._baz._empty_merged_tag_2_bzr])
# and again.
import_version('output2', pybaz.Version(self._baz._empty_merged_tag_2),
None)
branch2 = Branch.open('output2')
repo2 = branch2.repository
# and import what we should be merged up against for checking with.
import_version('output3', pybaz.Version(self._baz._empty_merged_tag),
None)
branch3 = Branch.open('output3')
self.assertEqual(branch.revision_history(), branch2.revision_history())
self.assertNotEqual(branch.revision_history(),
branch3.revision_history())
# check revisions in the history.
rev = repo.get_revision(self._baz._empty_merged_tag_2_bzr_base)
rev2 = repo2.get_revision(self._baz._empty_merged_tag_2_bzr_base)
# they must be the same
self.assertEqual(rev, rev2)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message,
"tag of demo@DONOTUSE/c--import--0--base-0")
self.assertEqual(rev.revision_id,
self._baz._empty_merged_tag_2_bzr_base)
# check next revisions in the history.
rev = repo.get_revision(self._baz._empty_merged_tag_2_bzr)
rev2 = repo2.get_revision(self._baz._empty_merged_tag_2_bzr)
# they must be the same
self.assertEqual(rev, rev2)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message, "merge in a merged tree.")
self.assertEqual(rev.revision_id, self._baz._empty_merged_tag_2_bzr)
self.assertEqual(rev.parent_ids[0],
self._baz._empty_merged_tag_2_bzr_base)
self.assertEqual(rev.parent_ids[1],
self._baz._empty_merged_tag_bzr)
# this tree should have nothing missing from that tree.
# FIXME there is no code for this right now.
# self.assertEqual(branch.missing_revisions(branch3), [])
def test_import_symlink(self):
import_version('output', pybaz.Version(self._baz._import_symlink),
None, max_count=1)
# expected results:
# two commits, no files, revision identifier of
# 'demo@DONOTUSE_c--import--0--base-0'
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
[self._baz._import_symlink_bzr])
rev = branch.repository.get_revision(self._baz._import_symlink_bzr)
# and again.
import_version('output2', pybaz.Version(self._baz._import_symlink),
None, max_count=1)
branch2 = Branch.open('output2')
self.assertEqual(branch.revision_history(), branch2.revision_history())
rev2 = branch2.repository.get_revision(self._baz._import_symlink_bzr)
# they must be the same
self.assertEqual(rev, rev2)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message, "Import with a symlink")
self.assertEqual(rev.revision_id, self._baz._import_symlink_bzr)
# and we want the symlink alink with target 'missing-file-name'
inv = branch.repository.get_inventory(rev.revision_id)
self.assertEqual(inv.path2id('alink'), 'x_symlink_tag')
entry = inv['x_symlink_tag']
self.assertEqual(entry.kind, 'symlink')
self.assertEqual(entry.symlink_target, 'missing-file-name')
# Test kind change for import
import_version('output3', pybaz.Version(self._baz._import_symlink),
None)
def test_missing_ancestor(self):
import_version('output', pybaz.Version(self._baz._missing_ancestor),
None)
# expected results:
# one commits, no files, revision identifiers of
# 'demo@DONOTUSE_c--gone--0--base-0' and
# a merge of demo-gone@DONOTUSE%c--import--0
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
[self._baz._missing_ancestor_bzr])
rev = branch.repository.get_revision(self._baz._missing_ancestor_bzr)
# and again.
import_version('output2', pybaz.Version(self._baz._missing_ancestor),
None)
branch2 = Branch.open('output2')
self.assertEqual(branch.revision_history(), branch2.revision_history())
rev2 = branch2.repository.get_revision(self._baz._missing_ancestor_bzr)
# they must be the same
self.assertEqual(rev, rev2)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message,
"tag of demo-gone@DONOTUSE/c--import--0--base-0")
self.assertEqual(rev.revision_id, self._baz._missing_ancestor_bzr)
self.assertEqual(rev.parent_ids[0], self._baz._missing_import_bzr)
self.assertEqual(1, len(rev.parent_ids))
# must NOT be able to get the merged evision
self.assertRaises(NoSuchRevision, branch.repository.get_revision,
self._baz._missing_import_bzr)
def test_missing_ancestor_reusing_history(self):
import_version('output', pybaz.Version(self._baz._missing_ancestor),
None,
reuse_history_from=[self._baz._missing_import_imported])
# expected results:
# one commits, no files, revision identifiers of
# 'demo-gone@DONOTUSE%c--import--0--base-0' and
# 'demo@DONOTUSE%c--gone--0--base-0'
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
[self._baz._missing_import_bzr,
self._baz._missing_ancestor_bzr])
rev = branch.repository.get_revision(self._baz._missing_ancestor_bzr)
# and again.
import_version('output2', pybaz.Version(self._baz._missing_ancestor),
None,
reuse_history_from=[self._baz._missing_import_imported])
branch2 = Branch.open('output2')
self.assertEqual(branch.revision_history(), branch2.revision_history())
rev2 = branch2.repository.get_revision(self._baz._missing_ancestor_bzr)
# they must be the same
self.assertEqual(rev, rev2)
# must be able to get the missing base revision
branch.repository.get_revision(self._baz._missing_import_bzr)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message,
"tag of demo-gone@DONOTUSE/c--import--0--base-0")
self.assertEqual(rev.revision_id, self._baz._missing_ancestor_bzr)
self.assertEqual(rev.parent_ids[0], self._baz._missing_import_bzr)
self.assertEqual(1, len(rev.parent_ids))
def test_bad_file_id(self):
import_version('output', pybaz.Version(self._baz._bad_id_tag), None)
# expected results:
# three commits, one files, revision identifiers of
# 'demo@DONOTUSE_c--import--0--base-0' ,
# 'demo@DONOTUSE/c--bad-id--0--base-0' ,
# ''demo@DONOTUSE/c--bad-id--0--patch-1'
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0',
self._baz._bad_id_tag_bzr_base,
self._baz._bad_id_tag_bzr])
rev = branch.repository.get_revision(self._baz._bad_id_tag_bzr)
inv = branch.repository.get_inventory(self._baz._bad_id_tag_bzr)
self.assertEqual(inv.path2id('path'), 'x_this_id%2fneeds%25escaping')
self.assertEqual('path', inv.id2path('x_this_id%2fneeds%25escaping'))
def test_appending_revisions_already_present(self):
import_version('output', pybaz.Version(self._baz._bad_id_tag), None,
max_count=2)
# expected results:
# three commits, one files, revision identifiers of
# 'demo@DONOTUSE_c--import--0--base-0' ,
# 'demo@DONOTUSE/c--bad-id--0--base-0' ,
# ''demo@DONOTUSE/c--bad-id--0--patch-1'
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0',
self._baz._bad_id_tag_bzr_base])
branch.set_revision_history(
['Arch-1:demo@DONOTUSE%c--import--0--base-0'])
del branch
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0'])
del branch
import_version('output', pybaz.Version(self._baz._bad_id_tag), None)
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0',
self._baz._bad_id_tag_bzr_base,
self._baz._bad_id_tag_bzr])
rev = branch.repository.get_revision(self._baz._bad_id_tag_bzr)
inv = branch.repository.get_inventory(self._baz._bad_id_tag_bzr)
self.assertEqual(inv.path2id('path'), 'x_this_id%2fneeds%25escaping')
self.assertEqual('path', inv.id2path('x_this_id%2fneeds%25escaping'))
def test_appending_revisions_all_already_present(self):
import_version('output', pybaz.Version(self._baz._bad_id_tag), None)
# expected results:
# three commits, one files, revision identifiers of
# 'demo@DONOTUSE_c--import--0--base-0' ,
# 'demo@DONOTUSE/c--bad-id--0--base-0' ,
# ''demo@DONOTUSE/c--bad-id--0--patch-1'
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0',
self._baz._bad_id_tag_bzr_base,
self._baz._bad_id_tag_bzr])
branch.set_revision_history(
['Arch-1:demo@DONOTUSE%c--import--0--base-0'])
del branch
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0'])
del branch
import_version('output', pybaz.Version(self._baz._bad_id_tag), None)
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0',
self._baz._bad_id_tag_bzr_base,
self._baz._bad_id_tag_bzr])
rev = branch.repository.get_revision(self._baz._bad_id_tag_bzr)
inv = branch.repository.get_inventory(self._baz._bad_id_tag_bzr)
self.assertEqual(inv.path2id('path'), 'x_this_id%2fneeds%25escaping')
self.assertEqual('path', inv.id2path('x_this_id%2fneeds%25escaping'))
def test_inbranch_conversion(self):
import_version('output', pybaz.Version(self._baz._inbranch_tag), None)
# expected results:
# three commits, no files, revision identifiers of
# 'demo@DONOTUSE_c--import--0--base-0' and
# self._baz._inbranch_tag_base_bzr
# self._baz._inbranch_tag_head_bzr
# with no merges.
branch = Branch.open('output')
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0',
self._baz._inbranch_tag_base_bzr,
self._baz._inbranch_tag_head_bzr])
# and again.
import_version('output2', pybaz.Version(self._baz._inbranch_tag), None)
branch2 = Branch.open('output2')
self.assertEqual(branch.revision_history(), branch2.revision_history())
# check revisions in the history.
rev = branch.repository.get_revision(self._baz._inbranch_tag_base_bzr)
rev2 = branch2.repository.get_revision(self._baz._inbranch_tag_base_bzr)
# they must be the same
self.assertEqual(rev, rev2)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message, "tag of demo@DONOTUSE/c--import--0--base-0")
self.assertEqual(rev.revision_id, self._baz._inbranch_tag_base_bzr)
# check next revisions in the history.
rev = branch.repository.get_revision(self._baz._inbranch_tag_head_bzr)
rev2 = branch2.repository.get_revision(self._baz._inbranch_tag_head_bzr)
# they must be the same
self.assertEqual(rev, rev2)
# and we should get some expected values:
self.assertEqual(rev.committer, "Test User<test@example.org>")
self.assertEqual(rev.message, "tag of demo@DONOTUSE/c--inbranch-tag--0--base-0")
self.assertEqual(rev.revision_id, self._baz._inbranch_tag_head_bzr)
self.assertEqual(rev.parent_ids,
[self._baz._inbranch_tag_base_bzr])
def test_no_commits_same_as_missing(self):
path = 'output'
os.mkdir(path)
branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(path)
import_version(path, pybaz.Version(self._baz._import), None)
# expected results:
# one commit, revision identifier of
# 'demo@DONOTUSE_c--import--0--base-0'
self.assertEqual(branch.revision_history(),
['Arch-1:demo@DONOTUSE%c--import--0--base-0'])
class TestNamespacePrevious(TestCase):
def setUp(self):
TestCase.setUp(self)
self.version = pybaz.Version('foo@example.com/c--b--0')
def test_base0_none(self):
self.assertEqual(namespace_previous(self.version['base-0']), None)
def test_patch1_base0(self):
self.assertEqual(namespace_previous(self.version['patch-1']),
self.version['base-0'])
def test_patch3000_patch2999(self):
self.assertEqual(namespace_previous(self.version['patch-3000']),
self.version['patch-2999'])
def test_version0_raises(self):
self.assertRaises(RuntimeError, namespace_previous,
self.version['version-0'])
def test_version1_version0(self):
self.assertEqual(namespace_previous(self.version['versionfix-1']),
self.version['version-0'])
def test_version3000_patch2999(self):
self.assertEqual(namespace_previous(self.version['versionfix-3000']),
self.version['versionfix-2999'])
class TestNamespaceMapping(TestCase):
def test_namespace_mapping_branch(self):
from bzrlib.plugins.bzrtools.baz_import import map_namespace
branch = pybaz.Branch('foo@example.com/c--b')
self.assertRaises(pybaz.errors.NamespaceError, map_namespace, branch)
self.assertEqual('c/b', map_namespace(branch['0']))
self.assertEqual('c/0.1/b', map_namespace(branch['0.1']))
def test_namespace_mapping_no_branch(self):
from bzrlib.plugins.bzrtools.baz_import import map_namespace
category = pybaz.Category('foo@example.com/c')
self.assertRaises(pybaz.errors.NamespaceError, map_namespace, category)
self.assertEqual('c/+trunk',
map_namespace(pybaz.Version("%s--0" % category)))
self.assertEqual('c/0.1/+trunk',
map_namespace(pybaz.Version('%s--0.1' % category)))
class TestFileIdMapping(TestCase):
def test_slash(self):
self.assertEqual('c%2fc', map_file_id('c/c'))
self.assertEqual('c%25c', map_file_id('c%c'))
class TestImport(TestCaseInTempDir):
def setUp(self):
TestCaseInTempDir.setUp(self)
self._oldhome = os.environ['HOME']
self._tmpdir = tempfile.mkdtemp()
self._homedir = os.path.join(self._tmpdir, 'home')
os.mkdir(self._homedir)
os.environ['HOME'] = self._homedir
self._archiveroot = os.path.join(self._tmpdir, 'archive')
self._archive = make_archive('demo@DONOTUSE', str(self._archiveroot))
def tearDown(self):
os.environ['HOME'] = self._oldhome
shutil.rmtree(self._tmpdir)
TestCaseInTempDir.tearDown(self)
def make_import(self, namespace):
self._import = 'demo@DONOTUSE/%s' % namespace
os.mkdir(os.path.join(self._tmpdir, 'tree'))
tree = pybaz.init_tree(os.path.join(self._tmpdir, 'tree'),
self._import)
msg = tree.log_message()
msg["summary"] = "I am importing now"
tree.import_(msg)
shutil.rmtree(os.path.join(self._tmpdir, 'tree'))
def test_cmd_exists(self):
from bzrlib.plugins.bzrtools import cmd_baz_import
def test_empty_archive(self):
command = cmd_baz_import()
command.run(os.path.join(self._tmpdir, 'output'), 'demo@DONOTUSE')
self.failUnless(os.path.exists(os.path.join(self._tmpdir,'output')))
walk_len = len(list(os.walk(os.path.join(self._tmpdir,'output'))))
self.assertEqual(9, walk_len)
def test_two_branches(self):
self.make_import('c--0')
self.make_import('c1--branch--0.2')
command = cmd_baz_import()
command.run(os.path.join(self._tmpdir, 'output'), 'demo@DONOTUSE')
self.failUnless(os.path.exists(os.path.join(self._tmpdir,'output')))
self.failUnless(os.path.exists(os.path.join(self._tmpdir,'output',
'c','+trunk')))
self.failUnless(os.path.exists(os.path.join(self._tmpdir,'output',
'c1', '0.2','branch')))
default_format = repository.RepositoryFormat.get_default_format()
walk_len = len(list(os.walk(os.path.join(self._tmpdir,'output'))))
self.assertEqual(22, walk_len)
def test_run_twice(self):
self.make_import('c--0')
command = cmd_baz_import()
command.run(os.path.join(self._tmpdir, 'output'), 'demo@DONOTUSE')
command.run(os.path.join(self._tmpdir, 'output'), 'demo@DONOTUSE')
def test_accepts_reuse_history(self):
self.make_import('c--0')
self.run_bzr(['baz-import', os.path.join(self._tmpdir, 'output'),
'demo@DONOTUSE', '.', '.'])
def test_does_not_need_reuse_history(self):
self.make_import('c--0')
self.run_bzr(['baz-import', os.path.join(self._tmpdir, 'output'),
'demo@DONOTUSE'])
def test_does_not_need_reuse_history(self):
self.make_import('c--0')
self.run_bzr(['baz-import', os.path.join(self._tmpdir, 'output'),
'demo@DONOTUSE'])
def test_encoding_flag(self):
self.make_import('c--0')
self.run_bzr(['baz-import', os.path.join(self._tmpdir, 'output'),
'demo@DONOTUSE'])
self.assertEqual(['Arch-1:demo@DONOTUSE%c--0--base-0'],
Branch.open(os.path.join(self._tmpdir,
'output/c/+trunk')).revision_history())
self.run_bzr(['baz-import', os.path.join(self._tmpdir, 'output2'),
'demo@DONOTUSE', '--encoding', 'utf-8'])
self.assertEqual(['Arch-1-utf-8:demo@DONOTUSE%c--0--base-0'],
Branch.open(os.path.join(self._tmpdir,
'output2/c/+trunk')).revision_history())
self.run_bzr(['baz-import-branch', os.path.join(self._tmpdir,
'output3'), 'demo@DONOTUSE/c--0'])
self.assertEqual(['Arch-1:demo@DONOTUSE%c--0--base-0'],
Branch.open(os.path.join(self._tmpdir,
'output3')).revision_history())
self.run_bzr(['baz-import-branch', os.path.join(self._tmpdir,
'output4'), 'demo@DONOTUSE/c--0', '--encoding', 'utf-8'])
self.assertEqual(['Arch-1-utf-8:demo@DONOTUSE%c--0--base-0'],
Branch.open(os.path.join(self._tmpdir,
'output4')).revision_history())
|
