~jelmer/brz/remove-branch-base

« back to all changes in this revision

Viewing changes to breezy/tests/test_extract.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-16 19:38:39 UTC
  • mfrom: (6852.3.1 is-versioned)
  • Revision ID: jelmer@jelmer.uk-20180216193839-a0efzmp1o64g86ln
Merge lp:~jelmer/brz/is-versioned.

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
        wt = self.make_branch_and_tree('a', format='rich-root-pack')
29
29
        wt.add(['b', 'b/c', 'd'], ['b-id', 'c-id', 'd-id'])
30
30
        wt.commit('added files')
31
 
        b_wt = wt.extract('b-id')
 
31
        b_wt = wt.extract('b', 'b-id')
32
32
        self.assertEqual('b-id', b_wt.get_root_id())
33
33
        self.assertEqual('c-id', b_wt.path2id('c'))
34
34
        self.assertEqual('c', b_wt.id2path('c-id'))
43
43
        wt = a_branch.create_checkout('a', lightweight=True)
44
44
        wt.add(['b', 'b/c', 'b/c/d'], ['b-id', 'c-id', 'd-id'])
45
45
        wt.commit('added files')
46
 
        return wt.extract('b-id')
 
46
        return wt.extract('b', 'b-id')
47
47
 
48
48
    def test_extract_in_checkout(self):
49
49
        a_branch = self.make_branch('branch', format='rich-root-pack')
59
59
        wt.add(['b', 'b/c', 'b/c/d', 'b/c/d/e/'], ['b-id', 'c-id', 'd-id',
60
60
                'e-id'])
61
61
        wt.commit('added files')
62
 
        b_wt = wt.extract('d-id')
 
62
        b_wt = wt.extract('b/c/d', 'd-id')
63
63
        b_branch = branch.Branch.open('branch/b/c/d')
64
64
        b_branch_ref = branch.Branch.open('a/b/c/d')
65
65
        self.assertEqual(b_branch.base, b_branch_ref.base)