/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to breezy/tests/test_tree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_tree.py
28
28
from breezy.tree import (
29
29
    FileTimestampUnavailable,
30
30
    InterTree,
 
31
    find_previous_paths,
31
32
    )
32
33
 
33
34
 
430
431
        self.assertPathToKey(([u''], u'a'), u'a')
431
432
        self.assertPathToKey(([u'a'], u'b'), u'a/b')
432
433
        self.assertPathToKey(([u'a', u'b'], u'c'), u'a/b/c')
 
434
 
 
435
 
 
436
class FindPreviousPathsTests(TestCaseWithTransport):
 
437
 
 
438
    def test_new(self):
 
439
        tree = self.make_branch_and_tree('tree')
 
440
        self.build_tree(['tree/b'])
 
441
        tree.add(['b'])
 
442
        revid1 = tree.commit('first')
 
443
        tree1 = tree.branch.repository.revision_tree(revid1)
 
444
 
 
445
        tree0 = tree.branch.repository.revision_tree(revision.NULL_REVISION)
 
446
 
 
447
        self.assertEqual({'b': None}, find_previous_paths(tree1, tree0, ['b']))
 
448
 
 
449
    def test_find_previous_paths(self):
 
450
        tree = self.make_branch_and_tree('tree')
 
451
        self.build_tree(['tree/b'])
 
452
        tree.add(['b'])
 
453
        revid1 = tree.commit('first')
 
454
        tree1 = tree.branch.repository.revision_tree(revid1)
 
455
 
 
456
        tree.rename_one('b', 'c')
 
457
        self.build_tree(['tree/b'])
 
458
        tree.add(['b'])
 
459
        revid2 = tree.commit('second')
 
460
        tree2 = tree.branch.repository.revision_tree(revid2)
 
461
 
 
462
        self.assertEqual({'c': 'b', 'b': None},
 
463
                         find_previous_paths(tree2, tree1, ['b', 'c']))