/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_delta.py

  • Committer: Jelmer Vernooij
  • Date: 2017-08-07 11:49:46 UTC
  • mto: (6747.3.4 avoid-set-revid-3)
  • mto: This revision was merged to the branch mainline in revision 6750.
  • Revision ID: jelmer@jelmer.uk-20170807114946-luclmxuawyzhpiot
Avoid setting revision_ids.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_delta.py
 
1
# Copyright (C) 2007-2010, 2016 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
import os
 
18
 
 
19
from .. import (
 
20
    delta as _mod_delta,
 
21
    revision as _mod_revision,
 
22
    tests,
 
23
    )
 
24
from ..sixish import (
 
25
    StringIO,
 
26
    )
 
27
 
 
28
 
 
29
class InstrumentedReporter(object):
 
30
    def __init__(self):
 
31
        self.calls = []
 
32
 
 
33
    def report(self, file_id, path, versioned, renamed, modified, exe_change,
 
34
               kind):
 
35
        self.calls.append((file_id, path, versioned, renamed, modified,
 
36
                           exe_change, kind))
 
37
 
 
38
 
 
39
class TestReportChanges(tests.TestCase):
 
40
    """Test the new change reporting infrastructure"""
 
41
 
 
42
    def assertReport(self, expected, file_id='fid', path='path',
 
43
                     versioned_change='unchanged', renamed=False,
 
44
                     modified='unchanged', exe_change=False,
 
45
                     kind=('file', 'file'), old_path=None,
 
46
                     unversioned_filter=None, view_info=None):
 
47
        if expected is None:
 
48
            expected_lines = None
 
49
        else:
 
50
            expected_lines = [expected]
 
51
        self.assertReportLines(expected_lines, file_id, path,
 
52
                     versioned_change, renamed,
 
53
                     modified, exe_change,
 
54
                     kind, old_path,
 
55
                     unversioned_filter, view_info)
 
56
 
 
57
    def assertReportLines(self, expected_lines, file_id='fid', path='path',
 
58
                     versioned_change='unchanged', renamed=False,
 
59
                     modified='unchanged', exe_change=False,
 
60
                     kind=('file', 'file'), old_path=None,
 
61
                     unversioned_filter=None, view_info=None):
 
62
        result = []
 
63
        def result_line(format, *args):
 
64
            result.append(format % args)
 
65
        reporter = _mod_delta._ChangeReporter(result_line,
 
66
            unversioned_filter=unversioned_filter, view_info=view_info)
 
67
        reporter.report(file_id, (old_path, path), versioned_change, renamed,
 
68
            modified, exe_change, kind)
 
69
        if expected_lines is not None:
 
70
            self.assertEqualDiff('\n'.join(expected_lines), '\n'.join(result))
 
71
        else:
 
72
            self.assertEqual([], result)
 
73
 
 
74
    def test_rename(self):
 
75
        self.assertReport('R   old => path', renamed=True, old_path='old')
 
76
        self.assertReport('    path')
 
77
        self.assertReport('RN  old => path', renamed=True, old_path='old',
 
78
                          modified='created', kind=(None, 'file'))
 
79
 
 
80
    def test_kind(self):
 
81
        self.assertReport(' K  path => path/', modified='kind changed',
 
82
                          kind=('file', 'directory'), old_path='path')
 
83
        self.assertReport(' K  path/ => path', modified='kind changed',
 
84
                          kind=('directory', 'file'), old_path='old')
 
85
        self.assertReport('RK  old => path/', renamed=True,
 
86
                          modified='kind changed',
 
87
                          kind=('file', 'directory'), old_path='old')
 
88
    def test_new(self):
 
89
        self.assertReport(' N  path/', modified='created',
 
90
                          kind=(None, 'directory'))
 
91
        self.assertReport('+   path/', versioned_change='added',
 
92
                          modified='unchanged', kind=(None, 'directory'))
 
93
        self.assertReport('+   path', versioned_change='added',
 
94
                          modified='unchanged', kind=(None, None))
 
95
        self.assertReport('+N  path/', versioned_change='added',
 
96
                          modified='created', kind=(None, 'directory'))
 
97
        self.assertReport('+M  path/', versioned_change='added',
 
98
                          modified='modified', kind=(None, 'directory'))
 
99
 
 
100
    def test_removal(self):
 
101
        self.assertReport(' D  path/', modified='deleted',
 
102
                          kind=('directory', None), old_path='old')
 
103
        self.assertReport('-   path/', versioned_change='removed',
 
104
                          old_path='path',
 
105
                          kind=(None, 'directory'))
 
106
        self.assertReport('-D  path', versioned_change='removed',
 
107
                          old_path='path',
 
108
                          modified='deleted', kind=('file', 'directory'))
 
109
 
 
110
    def test_modification(self):
 
111
        self.assertReport(' M  path', modified='modified')
 
112
        self.assertReport(' M* path', modified='modified', exe_change=True)
 
113
 
 
114
    def test_unversioned(self):
 
115
        # by default any unversioned file is output
 
116
        self.assertReport('?   subdir/foo~', file_id=None, path='subdir/foo~',
 
117
            old_path=None, versioned_change='unversioned',
 
118
            renamed=False, modified='created', exe_change=False,
 
119
            kind=(None, 'file'))
 
120
        # but we can choose to filter these. Probably that should be done
 
121
        # close to the tree, but this is a reasonable starting point.
 
122
        self.assertReport(None, file_id=None, path='subdir/foo~',
 
123
            old_path=None, versioned_change='unversioned',
 
124
            renamed=False, modified='created', exe_change=False,
 
125
            kind=(None, 'file'), unversioned_filter=lambda x:True)
 
126
 
 
127
    def test_missing(self):
 
128
        self.assertReport('+!  missing.c', file_id=None, path='missing.c',
 
129
             old_path=None, versioned_change='added',
 
130
             renamed=False, modified='missing', exe_change=False,
 
131
             kind=(None, None))
 
132
 
 
133
    def test_view_filtering(self):
 
134
        # If a file in within the view, it should appear in the output
 
135
        expected_lines = [
 
136
            "Operating on whole tree but only reporting on 'my' view.",
 
137
            " M  path"]
 
138
        self.assertReportLines(expected_lines, modified='modified',
 
139
            view_info=('my',['path']))
 
140
        # If a file in outside the view, it should not appear in the output
 
141
        expected_lines = [
 
142
            "Operating on whole tree but only reporting on 'my' view."]
 
143
        self.assertReportLines(expected_lines, modified='modified',
 
144
            path="foo", view_info=('my',['path']))
 
145
 
 
146
    def assertChangesEqual(self,
 
147
                           file_id='fid',
 
148
                           paths=('path', 'path'),
 
149
                           content_change=False,
 
150
                           versioned=(True, True),
 
151
                           parent_id=('pid', 'pid'),
 
152
                           name=('name', 'name'),
 
153
                           kind=('file', 'file'),
 
154
                           executable=(False, False),
 
155
                           versioned_change='unchanged',
 
156
                           renamed=False,
 
157
                           modified='unchanged',
 
158
                           exe_change=False):
 
159
        reporter = InstrumentedReporter()
 
160
        _mod_delta.report_changes([(file_id, paths, content_change, versioned,
 
161
            parent_id, name, kind, executable)], reporter)
 
162
        output = reporter.calls[0]
 
163
        self.assertEqual(file_id, output[0])
 
164
        self.assertEqual(paths, output[1])
 
165
        self.assertEqual(versioned_change, output[2])
 
166
        self.assertEqual(renamed, output[3])
 
167
        self.assertEqual(modified, output[4])
 
168
        self.assertEqual(exe_change, output[5])
 
169
        self.assertEqual(kind, output[6])
 
170
 
 
171
    def test_report_changes(self):
 
172
        """Test change detection of report_changes"""
 
173
        #Ensure no changes are detected by default
 
174
        self.assertChangesEqual(modified='unchanged', renamed=False,
 
175
                                versioned_change='unchanged',
 
176
                                exe_change=False)
 
177
        self.assertChangesEqual(modified='kind changed',
 
178
                                kind=('file', 'directory'))
 
179
        self.assertChangesEqual(modified='created', kind=(None, 'directory'))
 
180
        self.assertChangesEqual(modified='deleted', kind=('directory', None))
 
181
        self.assertChangesEqual(content_change=True, modified='modified')
 
182
        self.assertChangesEqual(renamed=True, name=('old', 'new'))
 
183
        self.assertChangesEqual(renamed=True,
 
184
                                parent_id=('old-parent', 'new-parent'))
 
185
        self.assertChangesEqual(versioned_change='added',
 
186
                                versioned=(False, True))
 
187
        self.assertChangesEqual(versioned_change='removed',
 
188
                                versioned=(True, False))
 
189
        # execute bit is only detected as "changed" if the file is and was
 
190
        # a regular file.
 
191
        self.assertChangesEqual(exe_change=True, executable=(True, False))
 
192
        self.assertChangesEqual(exe_change=False, executable=(True, False),
 
193
                                kind=('directory', 'directory'))
 
194
        self.assertChangesEqual(exe_change=False, modified='kind changed',
 
195
                                executable=(False, True),
 
196
                                kind=('directory', 'file'))
 
197
        self.assertChangesEqual(parent_id=('pid', None))
 
198
 
 
199
        # Now make sure they all work together
 
200
        self.assertChangesEqual(versioned_change='removed',
 
201
                                modified='deleted', versioned=(True, False),
 
202
                                kind=('directory', None))
 
203
        self.assertChangesEqual(versioned_change='removed',
 
204
                                modified='created', versioned=(True, False),
 
205
                                kind=(None, 'file'))
 
206
        self.assertChangesEqual(versioned_change='removed',
 
207
                                modified='modified', renamed=True,
 
208
                                exe_change=True, versioned=(True, False),
 
209
                                content_change=True, name=('old', 'new'),
 
210
                                executable=(False, True))
 
211
 
 
212
    def test_report_unversioned(self):
 
213
        """Unversioned entries are reported well."""
 
214
        self.assertChangesEqual(file_id=None, paths=(None, 'full/path'),
 
215
                           content_change=True,
 
216
                           versioned=(False, False),
 
217
                           parent_id=(None, None),
 
218
                           name=(None, 'path'),
 
219
                           kind=(None, 'file'),
 
220
                           executable=(None, False),
 
221
                           versioned_change='unversioned',
 
222
                           renamed=False,
 
223
                           modified='created',
 
224
                           exe_change=False)
 
225
 
 
226
 
 
227
class TestChangesFrom(tests.TestCaseWithTransport):
 
228
 
 
229
    def show_string(self, delta, *args,  **kwargs):
 
230
        to_file = StringIO()
 
231
        _mod_delta.report_delta(to_file, delta, *args, **kwargs)
 
232
        return to_file.getvalue()
 
233
 
 
234
    def test_kind_change(self):
 
235
        """Doing a status when a file has changed kind should work"""
 
236
        tree = self.make_branch_and_tree('.')
 
237
        self.build_tree(['filename'])
 
238
        tree.add('filename', 'file-id')
 
239
        tree.commit('added filename')
 
240
        os.unlink('filename')
 
241
        self.build_tree(['filename/'])
 
242
        delta = tree.changes_from(tree.basis_tree())
 
243
        self.assertEqual([('filename', 'file-id', 'file', 'directory')],
 
244
                         delta.kind_changed)
 
245
        self.assertEqual([], delta.added)
 
246
        self.assertEqual([], delta.removed)
 
247
        self.assertEqual([], delta.renamed)
 
248
        self.assertEqual([], delta.modified)
 
249
        self.assertEqual([], delta.unchanged)
 
250
        self.assertTrue(delta.has_changed())
 
251
        self.assertTrue(delta.touches_file_id('file-id'))
 
252
        self.assertEqual('kind changed:\n  filename (file => directory)\n',
 
253
                         self.show_string(delta))
 
254
        other_delta = _mod_delta.TreeDelta()
 
255
        self.assertNotEqual(other_delta, delta)
 
256
        other_delta.kind_changed = [('filename', 'file-id', 'file',
 
257
                                     'symlink')]
 
258
        self.assertNotEqual(other_delta, delta)
 
259
        other_delta.kind_changed = [('filename', 'file-id', 'file',
 
260
                                     'directory')]
 
261
        self.assertEqual(other_delta, delta)
 
262
        self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
 
263
            " kind_changed=[(u'filename', 'file-id', 'file', 'directory')],"
 
264
            " modified=[], unchanged=[], unversioned=[])", repr(delta))
 
265
        self.assertEqual('K  filename (file => directory) file-id\n',
 
266
                         self.show_string(delta, show_ids=True,
 
267
                         short_status=True))
 
268
 
 
269
        tree.rename_one('filename', 'dirname')
 
270
        delta = tree.changes_from(tree.basis_tree())
 
271
        self.assertEqual([], delta.kind_changed)
 
272
        # This loses the fact that kind changed, remembering it as a
 
273
        # modification
 
274
        self.assertEqual([('filename', 'dirname', 'file-id', 'directory',
 
275
                           True, False)], delta.renamed)
 
276
        self.assertTrue(delta.has_changed())
 
277
        self.assertTrue(delta.touches_file_id('file-id'))
 
278
 
 
279
 
 
280
class TestDeltaShow(tests.TestCaseWithTransport):
 
281
 
 
282
    def _get_delta(self):
 
283
        # We build the delta from a real tree to avoid depending on internal
 
284
        # implementation details.
 
285
        wt = self.make_branch_and_tree('branch')
 
286
        self.build_tree_contents([('branch/f1', '1\n'),
 
287
                                  ('branch/f2', '2\n'),
 
288
                                  ('branch/f3', '3\n'),
 
289
                                  ('branch/f4', '4\n'),
 
290
                                  ('branch/f5', '5\n'),
 
291
                                  ('branch/dir/',),
 
292
                                 ])
 
293
        wt.add(['f1', 'f2', 'f3', 'f4', 'dir'],
 
294
               ['f1-id', 'f2-id', 'f3-id', 'f4-id', 'dir-id'])
 
295
        wt.commit('commit one', rev_id='1')
 
296
 
 
297
        # TODO add rename,removed,etc. here?
 
298
        wt.add('f5')
 
299
        os.unlink('branch/f5')
 
300
 
 
301
        long_status = """added:
 
302
  dir/
 
303
  f1
 
304
  f2
 
305
  f3
 
306
  f4
 
307
missing:
 
308
  f5
 
309
"""
 
310
        short_status = """A  dir/
 
311
A  f1
 
312
A  f2
 
313
A  f3
 
314
A  f4
 
315
!  f5
 
316
"""
 
317
 
 
318
        repo = wt.branch.repository
 
319
        d = wt.changes_from(repo.revision_tree(_mod_revision.NULL_REVISION))
 
320
        return d, long_status, short_status
 
321
 
 
322
    def test_short_status(self):
 
323
        d, long_status, short_status = self._get_delta()
 
324
        out = StringIO()
 
325
        _mod_delta.report_delta(out, d, short_status=True)
 
326
        self.assertEqual(short_status, out.getvalue())
 
327
 
 
328
    def test_long_status(self):
 
329
        d, long_status, short_status = self._get_delta()
 
330
        out = StringIO()
 
331
        _mod_delta.report_delta(out, d, short_status=False)
 
332
        self.assertEqual(long_status, out.getvalue())
 
333
 
 
334
    def test_predicate_always(self):
 
335
        d, long_status, short_status = self._get_delta()
 
336
        out = StringIO()
 
337
        def always(path, file_id):
 
338
            return True
 
339
        _mod_delta.report_delta(out, d, short_status=True, predicate=always)
 
340
        self.assertEqual(short_status, out.getvalue())
 
341
 
 
342
    def test_short_status_path_predicate(self):
 
343
        d, long_status, short_status = self._get_delta()
 
344
        out = StringIO()
 
345
        def only_f2(path, file_id):
 
346
            return path == 'f2'
 
347
        _mod_delta.report_delta(out, d, short_status=True, predicate=only_f2)
 
348
        self.assertEqual("A  f2\n", out.getvalue())
 
349
 
 
350
    def test_long_status_path_predicate(self):
 
351
        d, long_status, short_status = self._get_delta()
 
352
        out = StringIO()
 
353
        def only_f2(path, file_id):
 
354
            return path == 'f2'
 
355
        _mod_delta.report_delta(out, d, short_status=False, predicate=only_f2)
 
356
        self.assertEqual("added:\n  f2\n", out.getvalue())
 
357
 
 
358
    def test_long_status_id_predicate(self):
 
359
        d, long_status, short_status = self._get_delta()
 
360
        out = StringIO()
 
361
        def only_f2_id(path, file_id):
 
362
            return file_id == 'f2-id'
 
363
        _mod_delta.report_delta(out, d, predicate=only_f2_id)
 
364
        self.assertEqual("added:\n  f2\n", out.getvalue())
 
365