1
# Copyright (C) 2007-2010, 2016 Canonical Ltd
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.
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.
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
17
from io import StringIO
22
revision as _mod_revision,
25
from ..tree import TreeChange
28
class InstrumentedReporter(object):
32
def report(self, path, versioned, renamed, copied, modified, exe_change,
35
(path, versioned, renamed, copied, modified, exe_change, kind))
38
class TestReportChanges(tests.TestCase):
39
"""Test the new change reporting infrastructure"""
41
def assertReport(self, expected, file_id=b'fid', path='path',
42
versioned_change='unchanged', renamed=False,
43
copied=False, modified='unchanged', exe_change=False,
44
kind=('file', 'file'), old_path=None,
45
unversioned_filter=None, view_info=None):
49
expected_lines = [expected]
50
self.assertReportLines(expected_lines, file_id, path,
51
versioned_change, renamed,
52
copied, modified, exe_change,
54
unversioned_filter, view_info)
56
def assertReportLines(self, expected_lines, file_id=b'fid', path='path',
57
versioned_change='unchanged', renamed=False, copied=False,
58
modified='unchanged', exe_change=False,
59
kind=('file', 'file'), old_path=None,
60
unversioned_filter=None, view_info=None):
63
def result_line(format, *args):
64
result.append(format % args)
65
reporter = _mod_delta._ChangeReporter(
66
result_line, unversioned_filter=unversioned_filter,
68
reporter.report((old_path, path), versioned_change, renamed, copied,
69
modified, exe_change, kind)
70
if expected_lines is not None:
71
self.assertEqualDiff('\n'.join(expected_lines), '\n'.join(result))
73
self.assertEqual([], result)
75
def test_rename(self):
76
self.assertReport('R old => path', renamed=True, old_path='old')
77
self.assertReport(' path')
78
self.assertReport('RN old => path', renamed=True, old_path='old',
79
modified='created', kind=(None, 'file'))
82
self.assertReport(' K path => path/', modified='kind changed',
83
kind=('file', 'directory'), old_path='path')
84
self.assertReport(' K path/ => path', modified='kind changed',
85
kind=('directory', 'file'), old_path='old')
86
self.assertReport('RK old => path/', renamed=True,
87
modified='kind changed',
88
kind=('file', 'directory'), old_path='old')
91
self.assertReport(' N path/', modified='created',
92
kind=(None, 'directory'))
93
self.assertReport('+ path/', versioned_change='added',
94
modified='unchanged', kind=(None, 'directory'))
95
self.assertReport('+ path', versioned_change='added',
96
modified='unchanged', kind=(None, None))
97
self.assertReport('+N path/', versioned_change='added',
98
modified='created', kind=(None, 'directory'))
99
self.assertReport('+M path/', versioned_change='added',
100
modified='modified', kind=(None, 'directory'))
102
def test_removal(self):
103
self.assertReport(' D path/', modified='deleted',
104
kind=('directory', None), old_path='old')
105
self.assertReport('- path/', versioned_change='removed',
107
kind=(None, 'directory'))
108
self.assertReport('-D path', versioned_change='removed',
110
modified='deleted', kind=('file', 'directory'))
112
def test_modification(self):
113
self.assertReport(' M path', modified='modified')
114
self.assertReport(' M* path', modified='modified', exe_change=True)
116
def test_unversioned(self):
117
# by default any unversioned file is output
118
self.assertReport('? subdir/foo~', file_id=None, path='subdir/foo~',
119
old_path=None, versioned_change='unversioned',
120
renamed=False, modified='created', exe_change=False,
122
# but we can choose to filter these. Probably that should be done
123
# close to the tree, but this is a reasonable starting point.
124
self.assertReport(None, file_id=None, path='subdir/foo~',
125
old_path=None, versioned_change='unversioned',
126
renamed=False, modified='created', exe_change=False,
127
kind=(None, 'file'), unversioned_filter=lambda x: True)
129
def test_missing(self):
130
self.assertReport('+! missing.c', file_id=None, path='missing.c',
131
old_path=None, versioned_change='added',
132
renamed=False, modified='missing', exe_change=False,
135
def test_view_filtering(self):
136
# If a file in within the view, it should appear in the output
138
"Operating on whole tree but only reporting on 'my' view.",
140
self.assertReportLines(expected_lines, modified='modified',
141
view_info=('my', ['path']))
142
# If a file in outside the view, it should not appear in the output
144
"Operating on whole tree but only reporting on 'my' view."]
145
self.assertReportLines(expected_lines, modified='modified',
146
path="foo", view_info=('my', ['path']))
148
def assertChangesEqual(self,
150
paths=('path', 'path'),
151
content_change=False,
152
versioned=(True, True),
153
parent_id=('pid', 'pid'),
154
name=('name', 'name'),
155
kind=('file', 'file'),
156
executable=(False, False),
157
versioned_change='unchanged',
160
modified='unchanged',
162
reporter = InstrumentedReporter()
163
_mod_delta.report_changes([
165
file_id, paths, content_change, versioned, parent_id,
166
name, kind, executable, copied)], reporter)
167
output = reporter.calls[0]
168
self.assertEqual(paths, output[0])
169
self.assertEqual(versioned_change, output[1])
170
self.assertEqual(renamed, output[2])
171
self.assertEqual(copied, output[3])
172
self.assertEqual(modified, output[4])
173
self.assertEqual(exe_change, output[5])
174
self.assertEqual(kind, output[6])
176
def test_report_changes(self):
177
"""Test change detection of report_changes"""
178
# Ensure no changes are detected by default
179
self.assertChangesEqual(modified='unchanged', renamed=False,
180
versioned_change='unchanged',
182
self.assertChangesEqual(modified='kind changed',
183
kind=('file', 'directory'))
184
self.assertChangesEqual(modified='created', kind=(None, 'directory'))
185
self.assertChangesEqual(modified='deleted', kind=('directory', None))
186
self.assertChangesEqual(content_change=True, modified='modified')
187
self.assertChangesEqual(renamed=True, name=('old', 'new'))
188
self.assertChangesEqual(renamed=True,
189
parent_id=('old-parent', 'new-parent'))
190
self.assertChangesEqual(versioned_change='added',
191
versioned=(False, True))
192
self.assertChangesEqual(versioned_change='removed',
193
versioned=(True, False))
194
# execute bit is only detected as "changed" if the file is and was
196
self.assertChangesEqual(exe_change=True, executable=(True, False))
197
self.assertChangesEqual(exe_change=False, executable=(True, False),
198
kind=('directory', 'directory'))
199
self.assertChangesEqual(exe_change=False, modified='kind changed',
200
executable=(False, True),
201
kind=('directory', 'file'))
202
self.assertChangesEqual(parent_id=('pid', None))
204
# Now make sure they all work together
205
self.assertChangesEqual(versioned_change='removed',
206
modified='deleted', versioned=(True, False),
207
kind=('directory', None))
208
self.assertChangesEqual(versioned_change='removed',
209
modified='created', versioned=(True, False),
211
self.assertChangesEqual(versioned_change='removed',
212
modified='modified', renamed=True,
213
exe_change=True, versioned=(True, False),
214
content_change=True, name=('old', 'new'),
215
executable=(False, True))
217
def test_report_unversioned(self):
218
"""Unversioned entries are reported well."""
219
self.assertChangesEqual(file_id=None, paths=(None, 'full/path'),
221
versioned=(False, False),
222
parent_id=(None, None),
225
executable=(None, False),
226
versioned_change='unversioned',
232
class TestChangesFrom(tests.TestCaseWithTransport):
234
def show_string(self, delta, *args, **kwargs):
236
_mod_delta.report_delta(to_file, delta, *args, **kwargs)
237
return to_file.getvalue()
239
def test_kind_change(self):
240
"""Doing a status when a file has changed kind should work"""
241
tree = self.make_branch_and_tree('.')
242
self.build_tree(['filename'])
243
tree.add('filename', b'file-id')
244
tree.commit('added filename')
245
os.unlink('filename')
246
self.build_tree(['filename/'])
247
delta = tree.changes_from(tree.basis_tree())
248
self.assertEqual([('filename', 'file', 'directory')],
249
[(c.path[1], c.kind[0], c.kind[1]) for c in delta.kind_changed])
250
self.assertEqual([], delta.added)
251
self.assertEqual([], delta.removed)
252
self.assertEqual([], delta.renamed)
253
self.assertEqual([], delta.modified)
254
self.assertEqual([], delta.unchanged)
255
self.assertTrue(delta.has_changed())
256
self.assertEqual('kind changed:\n filename (file => directory)\n',
257
self.show_string(delta))
258
other_delta = _mod_delta.TreeDelta()
259
self.assertNotEqual(other_delta, delta)
260
other_delta.kind_changed = [
263
('filename', 'filename'), True, (True, True),
264
(tree.path2id(''), tree.path2id('')),
265
('filename', 'filename'),
266
('file', 'symlink'), (False, False))]
267
self.assertNotEqual(other_delta, delta)
268
other_delta.kind_changed = [
271
('filename', 'filename'), True, (True, True),
272
(tree.path2id(''), tree.path2id('')), ('filename', 'filename'),
273
('file', 'directory'), (False, False))]
274
self.assertEqual(other_delta, delta)
275
self.assertEqual('K filename (file => directory) file-id\n',
276
self.show_string(delta, show_ids=True,
279
tree.rename_one('filename', 'dirname')
280
delta = tree.changes_from(tree.basis_tree())
281
self.assertEqual([], delta.kind_changed)
282
# This loses the fact that kind changed, remembering it as a
284
self.assertEqual([TreeChange(
285
b'file-id', ('filename', 'dirname'), True,
286
(True, True), (tree.path2id(''), tree.path2id('')),
287
('filename', 'dirname'), ('file', 'directory'), (False, False))],
289
self.assertTrue(delta.has_changed())
292
class TestDeltaShow(tests.TestCaseWithTransport):
294
def _get_delta(self):
295
# We build the delta from a real tree to avoid depending on internal
296
# implementation details.
297
wt = self.make_branch_and_tree('branch')
298
self.build_tree_contents([('branch/f1', b'1\n'),
299
('branch/f2', b'2\n'),
300
('branch/f3', b'3\n'),
301
('branch/f4', b'4\n'),
302
('branch/f5', b'5\n'),
305
wt.add(['f1', 'f2', 'f3', 'f4', 'dir'],
306
[b'f1-id', b'f2-id', b'f3-id', b'f4-id', b'dir-id'])
307
wt.commit('commit one', rev_id=b'1')
309
# TODO add rename,removed,etc. here?
311
os.unlink('branch/f5')
313
long_status = """added:
322
short_status = """A dir/
330
repo = wt.branch.repository
331
d = wt.changes_from(repo.revision_tree(_mod_revision.NULL_REVISION))
332
return d, long_status, short_status
334
def test_short_status(self):
335
d, long_status, short_status = self._get_delta()
337
_mod_delta.report_delta(out, d, short_status=True)
338
self.assertEqual(short_status, out.getvalue())
340
def test_long_status(self):
341
d, long_status, short_status = self._get_delta()
343
_mod_delta.report_delta(out, d, short_status=False)
344
self.assertEqual(long_status, out.getvalue())
346
def test_predicate_always(self):
347
d, long_status, short_status = self._get_delta()
352
_mod_delta.report_delta(out, d, short_status=True, predicate=always)
353
self.assertEqual(short_status, out.getvalue())
355
def test_short_status_path_predicate(self):
356
d, long_status, short_status = self._get_delta()
361
_mod_delta.report_delta(out, d, short_status=True, predicate=only_f2)
362
self.assertEqual("A f2\n", out.getvalue())
364
def test_long_status_path_predicate(self):
365
d, long_status, short_status = self._get_delta()
370
_mod_delta.report_delta(out, d, short_status=False, predicate=only_f2)
371
self.assertEqual("added:\n f2\n", out.getvalue())