/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/git/tests/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-02 22:31:28 UTC
  • mfrom: (7291 work)
  • mto: This revision was merged to the branch mainline in revision 7293.
  • Revision ID: jelmer@jelmer.uk-20190302223128-0qk1i5tozmzq5nyq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_workingtree.py
91
91
        self.tree._ignoremanager = None
92
92
        self.assertTrue(self.tree.is_ignored('a'))
93
93
 
 
94
    def test_add_submodule_dir(self):
 
95
        subtree = self.make_branch_and_tree('asub', format='git')
 
96
        subtree.commit('Empty commit')
 
97
        self.tree.add(['asub'])
 
98
        with self.tree.lock_read():
 
99
            entry = self.tree.index[b'asub']
 
100
            self.assertEqual(entry.mode, S_IFGITLINK)
 
101
        self.assertEqual([], list(subtree.unknowns()))
 
102
 
 
103
    def test_add_submodule_file(self):
 
104
        os.mkdir('.git/modules')
 
105
        subbranch = self.make_branch('.git/modules/asub', format='git-bare')
 
106
        os.mkdir('asub')
 
107
        with open('asub/.git', 'w') as f:
 
108
            f.write('gitdir: ../.git/modules/asub\n')
 
109
        subtree = _mod_workingtree.WorkingTree.open('asub')
 
110
        subtree.commit('Empty commit')
 
111
        self.tree.add(['asub'])
 
112
        with self.tree.lock_read():
 
113
            entry = self.tree.index[b'asub']
 
114
            self.assertEqual(entry.mode, S_IFGITLINK)
 
115
        self.assertEqual([], list(subtree.unknowns()))
 
116
 
94
117
 
95
118
class GitWorkingTreeFileTests(TestCaseWithTransport):
96
119