← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import bzrdir
21
 
from bzrlib.tests import TestCaseWithTransport, TestCase
22
 
from bzrlib.branch import Branch
23
 
from bzrlib.conflicts import (
24
 
    ConflictList,
25
 
    ContentsConflict,
26
 
    DuplicateID,
27
 
    DuplicateEntry,
28
 
    MissingParent,
29
 
    NonDirectoryParent,
30
 
    ParentLoop,
31
 
    PathConflict,
32
 
    TextConflict,
33
 
    UnversionedParent,
34
 
    resolve,
35
 
    restore,
 
20
from bzrlib import (
 
21
    bzrdir,
 
22
    conflicts,
 
23
    errors,
 
24
    tests,
36
25
    )
37
 
from bzrlib.errors import NotConflicted
38
26
 
39
27
 
40
28
# TODO: Test commit with some added, and added-but-missing files
44
32
# be a sorted list.
45
33
# u'\xe5' == a with circle
46
34
# '\xc3\xae' == u'\xee' == i with hat
47
 
# So these are u'pathg' and 'idg' only with a circle and a hat. (shappo?)
48
 
example_conflicts = ConflictList([
49
 
    MissingParent('Not deleting', u'p\xe5thg', '\xc3\xaedg'),
50
 
    ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'),
51
 
    TextConflict(u'p\xe5tha'),
52
 
    PathConflict(u'p\xe5thb', u'p\xe5thc', '\xc3\xaedb'),
53
 
    DuplicateID('Unversioned existing file', u'p\xe5thc', u'p\xe5thc2',
54
 
                '\xc3\xaedc', '\xc3\xaedc'),
55
 
    DuplicateEntry('Moved existing file to',  u'p\xe5thdd.moved', u'p\xe5thd',
56
 
                   '\xc3\xaedd', None),
57
 
    ParentLoop('Cancelled move', u'p\xe5the', u'p\xe5th2e',
58
 
               None, '\xc3\xaed2e'),
59
 
    UnversionedParent('Versioned directory', u'p\xe5thf', '\xc3\xaedf'),
60
 
    NonDirectoryParent('Created directory', u'p\xe5thg', '\xc3\xaedg'),
 
35
# So these are u'path' and 'id' only with a circle and a hat. (shappo?)
 
36
example_conflicts = conflicts.ConflictList(
 
37
    [conflicts.MissingParent('Not deleting', u'p\xe5thg', '\xc3\xaedg'),
 
38
     conflicts.ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'),
 
39
     conflicts.TextConflict(u'p\xe5tha'),
 
40
     conflicts.PathConflict(u'p\xe5thb', u'p\xe5thc', '\xc3\xaedb'),
 
41
     conflicts.DuplicateID('Unversioned existing file',
 
42
                           u'p\xe5thc', u'p\xe5thc2',
 
43
                           '\xc3\xaedc', '\xc3\xaedc'),
 
44
    conflicts.DuplicateEntry('Moved existing file to',
 
45
                             u'p\xe5thdd.moved', u'p\xe5thd',
 
46
                             '\xc3\xaedd', None),
 
47
    conflicts.ParentLoop('Cancelled move', u'p\xe5the', u'p\xe5th2e',
 
48
                         None, '\xc3\xaed2e'),
 
49
    conflicts.UnversionedParent('Versioned directory',
 
50
                                u'p\xe5thf', '\xc3\xaedf'),
 
51
    conflicts.NonDirectoryParent('Created directory',
 
52
                                 u'p\xe5thg', '\xc3\xaedg'),
61
53
])
62
54
 
63
55
 
64
 
class TestConflicts(TestCaseWithTransport):
 
56
class TestConflicts(tests.TestCaseWithTransport):
65
57
 
66
58
    def test_conflicts(self):
67
59
        """Conflicts are detected properly"""
68
 
        tree = self.make_branch_and_tree('.',
69
 
            format=bzrdir.BzrDirFormat6())
70
 
        b = tree.branch
71
 
        file('hello', 'w').write('hello world4')
72
 
        file('hello.THIS', 'w').write('hello world2')
73
 
        file('hello.BASE', 'w').write('hello world1')
74
 
        file('hello.OTHER', 'w').write('hello world3')
75
 
        file('hello.sploo.BASE', 'w').write('yellow world')
76
 
        file('hello.sploo.OTHER', 'w').write('yellow world2')
 
60
        # Use BzrDirFormat6 so we can fake conflicts
 
61
        tree = self.make_branch_and_tree('.', format=bzrdir.BzrDirFormat6())
 
62
        self.build_tree_contents([('hello', 'hello world4'),
 
63
                                  ('hello.THIS', 'hello world2'),
 
64
                                  ('hello.BASE', 'hello world1'),
 
65
                                  ('hello.OTHER', 'hello world3'),
 
66
                                  ('hello.sploo.BASE', 'yellowworld'),
 
67
                                  ('hello.sploo.OTHER', 'yellowworld2'),
 
68
                                  ])
77
69
        tree.lock_read()
78
 
        self.assertEqual(len(list(tree.list_files())), 6)
 
70
        self.assertEqual(6, len(list(tree.list_files())))
79
71
        tree.unlock()
80
 
        conflicts = tree.conflicts()
81
 
        self.assertEqual(len(conflicts), 2)
82
 
        self.assert_('hello' in conflicts[0].path)
83
 
        self.assert_('hello.sploo' in conflicts[1].path)
84
 
        restore('hello')
85
 
        restore('hello.sploo')
86
 
        self.assertEqual(len(tree.conflicts()), 0)
 
72
        tree_conflicts = tree.conflicts()
 
73
        self.assertEqual(2, len(tree_conflicts))
 
74
        self.assertTrue('hello' in tree_conflicts[0].path)
 
75
        self.assertTrue('hello.sploo' in tree_conflicts[1].path)
 
76
        conflicts.restore('hello')
 
77
        conflicts.restore('hello.sploo')
 
78
        self.assertEqual(0, len(tree.conflicts()))
87
79
        self.assertFileEqual('hello world2', 'hello')
88
80
        self.assertFalse(os.path.lexists('hello.sploo'))
89
 
        self.assertRaises(NotConflicted, restore, 'hello')
90
 
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
 
81
        self.assertRaises(errors.NotConflicted, conflicts.restore, 'hello')
 
82
        self.assertRaises(errors.NotConflicted,
 
83
                          conflicts.restore, 'hello.sploo')
91
84
 
92
85
    def test_resolve_conflict_dir(self):
93
86
        tree = self.make_branch_and_tree('.')
94
 
        b = tree.branch
95
 
        file('hello', 'w').write('hello world4')
 
87
        self.build_tree_contents([('hello', 'hello world4'),
 
88
                                  ('hello.THIS', 'hello world2'),
 
89
                                  ('hello.BASE', 'hello world1'),
 
90
                                  ])
 
91
        os.mkdir('hello.OTHER')
96
92
        tree.add('hello', 'q')
97
 
        file('hello.THIS', 'w').write('hello world2')
98
 
        file('hello.BASE', 'w').write('hello world1')
99
 
        os.mkdir('hello.OTHER')
100
 
        l = ConflictList([TextConflict('hello')])
 
93
        l = conflicts.ConflictList([conflicts.TextConflict('hello')])
101
94
        l.remove_files(tree)
102
95
 
103
96
    def test_select_conflicts(self):
104
97
        tree = self.make_branch_and_tree('.')
105
 
        tree_conflicts = ConflictList([ContentsConflict('foo'),
106
 
                                       ContentsConflict('bar')])
107
 
        self.assertEqual((ConflictList([ContentsConflict('bar')]),
108
 
                          ConflictList([ContentsConflict('foo')])),
109
 
                         tree_conflicts.select_conflicts(tree, ['foo']))
110
 
        self.assertEqual((ConflictList(), tree_conflicts),
111
 
                         tree_conflicts.select_conflicts(tree, [''],
112
 
                         ignore_misses=True, recurse=True))
113
 
        tree_conflicts = ConflictList([ContentsConflict('foo/baz'),
114
 
                                       ContentsConflict('bar')])
115
 
        self.assertEqual((ConflictList([ContentsConflict('bar')]),
116
 
                          ConflictList([ContentsConflict('foo/baz')])),
117
 
                         tree_conflicts.select_conflicts(tree, ['foo'],
118
 
                                                         recurse=True,
119
 
                                                         ignore_misses=True))
120
 
        tree_conflicts = ConflictList([PathConflict('qux', 'foo/baz')])
121
 
        self.assertEqual((ConflictList(), tree_conflicts),
122
 
                         tree_conflicts.select_conflicts(tree, ['foo'],
123
 
                                                         recurse=True,
124
 
                                                         ignore_misses=True))
125
 
        self.assertEqual((tree_conflicts, ConflictList()),
126
 
                         tree_conflicts.select_conflicts(tree, ['foo'],
127
 
                                                         ignore_misses=True))
 
98
        clist = conflicts.ConflictList
 
99
 
 
100
        def check_select(not_selected, selected, paths, **kwargs):
 
101
            self.assertEqual(
 
102
                (not_selected, selected),
 
103
                tree_conflicts.select_conflicts(tree, paths, **kwargs))
 
104
 
 
105
        foo = conflicts.ContentsConflict('foo')
 
106
        bar = conflicts.ContentsConflict('bar')
 
107
        tree_conflicts = clist([foo, bar])
 
108
 
 
109
        check_select(clist([bar]), clist([foo]), ['foo'])
 
110
        check_select(clist(), tree_conflicts,
 
111
                     [''], ignore_misses=True, recurse=True)
 
112
 
 
113
        foobaz  = conflicts.ContentsConflict('foo/baz')
 
114
        tree_conflicts = clist([foobaz, bar])
 
115
 
 
116
        check_select(clist([bar]), clist([foobaz]),
 
117
                     ['foo'], ignore_misses=True, recurse=True)
 
118
 
 
119
        qux = conflicts.PathConflict('qux', 'foo/baz')
 
120
        tree_conflicts = clist([qux])
 
121
 
 
122
        check_select(clist(), tree_conflicts,
 
123
                     ['foo'], ignore_misses=True, recurse=True)
 
124
        check_select (tree_conflicts, clist(), ['foo'], ignore_misses=True)
128
125
 
129
126
    def test_resolve_conflicts_recursive(self):
130
127
        tree = self.make_branch_and_tree('.')
131
128
        self.build_tree(['dir/', 'dir/hello'])
132
129
        tree.add(['dir', 'dir/hello'])
133
 
        tree.set_conflicts(ConflictList([TextConflict('dir/hello')]))
134
 
        resolve(tree, ['dir'], recursive=False, ignore_misses=True)
135
 
        self.assertEqual(ConflictList([TextConflict('dir/hello')]),
136
 
                         tree.conflicts())
137
 
        resolve(tree, ['dir'], recursive=True, ignore_misses=True)
138
 
        self.assertEqual(ConflictList([]),
139
 
                         tree.conflicts())
140
 
 
141
 
 
142
 
class TestConflictStanzas(TestCase):
 
130
 
 
131
        dirhello = conflicts.ConflictList([conflicts.TextConflict('dir/hello')])
 
132
        tree.set_conflicts(dirhello)
 
133
 
 
134
        conflicts.resolve(tree, ['dir'], recursive=False, ignore_misses=True)
 
135
        self.assertEqual(dirhello, tree.conflicts())
 
136
 
 
137
        conflicts.resolve(tree, ['dir'], recursive=True, ignore_misses=True)
 
138
        self.assertEqual(conflicts.ConflictList([]), tree.conflicts())
 
139
 
 
140
 
 
141
class TestConflictStanzas(tests.TestCase):
143
142
 
144
143
    def test_stanza_roundtrip(self):
145
144
        # write and read our example stanza.
146
145
        stanza_iter = example_conflicts.to_stanzas()
147
 
        processed = ConflictList.from_stanzas(stanza_iter)
 
146
        processed = conflicts.ConflictList.from_stanzas(stanza_iter)
148
147
        for o, p in zip(processed, example_conflicts):
149
148
            self.assertEqual(o, p)
150
149
 
171
170
                self.assertStartsWith(stanza['conflict_path'], u'p\xe5th')
172
171
            if 'conflict_file_id' in stanza:
173
172
                self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')
 
173