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
|
# Copyright (C) 2020 Jelmer Vernooij <jelmer@jelmer.uk>
#
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests for tree transform."""
from __future__ import absolute_import
import os
from ...transform import ROOT_PARENT, conflict_pass, resolve_conflicts
from . import TestCaseWithTransport
class GitTransformTests(TestCaseWithTransport):
def test_directory_exists(self):
tree = self.make_branch_and_tree('.', format='git')
tt = tree.transform()
dir1 = tt.new_directory('dir', ROOT_PARENT)
tt.new_file('name1', dir1, [b'content1'])
dir2 = tt.new_directory('dir', ROOT_PARENT)
tt.new_file('name2', dir2, [b'content2'])
raw_conflicts = resolve_conflicts(
tt, None, lambda t, c: conflict_pass(t, c))
conflicts = tt.cook_conflicts(raw_conflicts)
self.assertEqual([], list(conflicts))
tt.apply()
self.assertEqual(set(['name1', 'name2']), set(os.listdir('dir')))
|