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
21
revision as _mod_revision,
24
from ..tree import TreeChange
25
from ..sixish import (
31
class InstrumentedReporter(object):
35
def report(self, path, versioned, renamed, copied, modified, exe_change,
38
(path, versioned, renamed, copied, modified, exe_change, kind))
41
class TestReportChanges(tests.TestCase):
42
"""Test the new change reporting infrastructure"""
44
def assertReport(self, expected, file_id=b'fid', path='path',
45
versioned_change='unchanged', renamed=False,
46
copied=False, modified='unchanged', exe_change=False,
47
kind=('file', 'file'), old_path=None,
48
unversioned_filter=None, view_info=None):
52
expected_lines = [expected]
53
self.assertReportLines(expected_lines, file_id, path,
54
versioned_change, renamed,
55
copied, modified, exe_change,
57
unversioned_filter, view_info)
59
def assertReportLines(self, expected_lines, file_id=b'fid', path='path',
60
versioned_change='unchanged', renamed=False, copied=False,
61
modified='unchanged', exe_change=False,
62
kind=('file', 'file'), old_path=None,
63
unversioned_filter=None, view_info=None):
66
def result_line(format, *args):
67
result.append(format % args)
68
reporter = _mod_delta._ChangeReporter(
69
result_line, unversioned_filter=unversioned_filter,
71
reporter.report((old_path, path), versioned_change, renamed, copied,
72
modified, exe_change, kind)
73
if expected_lines is not None:
74
self.assertEqualDiff('\n'.join(expected_lines), '\n'.join(result))
76
self.assertEqual([], result)
78
def test_rename(self):
79
self.assertReport('R old => path', renamed=True, old_path='old')
80
self.assertReport(' path')
81
self.assertReport('RN old => path', renamed=True, old_path='old',
82
modified='created', kind=(None, 'file'))
85
self.assertReport(' K path => path/', modified='kind changed',
86
kind=('file', 'directory'), old_path='path')
87
self.assertReport(' K path/ => path', modified='kind changed',
88
kind=('directory', 'file'), old_path='old')
89
self.assertReport('RK old => path/', renamed=True,
90
modified='kind changed',
91
kind=('file', 'directory'), old_path='old')
94
self.assertReport(' N path/', modified='created',
95
kind=(None, 'directory'))
96
self.assertReport('+ path/', versioned_change='added',
97
modified='unchanged', kind=(None, 'directory'))
98
self.assertReport('+ path', versioned_change='added',
99
modified='unchanged', kind=(None, None))
100
self.assertReport('+N path/', versioned_change='added',
101
modified='created', kind=(None, 'directory'))
102
self.assertReport('+M path/', versioned_change='added',
103
modified='modified', kind=(None, 'directory'))
105
def test_removal(self):
106
self.assertReport(' D path/', modified='deleted',
107
kind=('directory', None), old_path='old')
108
self.assertReport('- path/', versioned_change='removed',
110
kind=(None, 'directory'))
111
self.assertReport('-D path', versioned_change='removed',
113
modified='deleted', kind=('file', 'directory'))
115
def test_modification(self):
116
self.assertReport(' M path', modified='modified')
117
self.assertReport(' M* path', modified='modified', exe_change=True)
119
def test_unversioned(self):
120
# by default any unversioned file is output
121
self.assertReport('? subdir/foo~', file_id=None, path='subdir/foo~',
122
old_path=None, versioned_change='unversioned',
123
renamed=False, modified='created', exe_change=False,
125
# but we can choose to filter these. Probably that should be done
126
# close to the tree, but this is a reasonable starting point.
127
self.assertReport(None, file_id=None, path='subdir/foo~',
128
old_path=None, versioned_change='unversioned',
129
renamed=False, modified='created', exe_change=False,
130
kind=(None, 'file'), unversioned_filter=lambda x: True)
132
def test_missing(self):
133
self.assertReport('+! missing.c', file_id=None, path='missing.c',
134
old_path=None, versioned_change='added',
135
renamed=False, modified='missing', exe_change=False,
138
def test_view_filtering(self):
139
# If a file in within the view, it should appear in the output
141
"Operating on whole tree but only reporting on 'my' view.",
143
self.assertReportLines(expected_lines, modified='modified',
144
view_info=('my', ['path']))
145
# If a file in outside the view, it should not appear in the output
147
"Operating on whole tree but only reporting on 'my' view."]
148
self.assertReportLines(expected_lines, modified='modified',
149
path="foo", view_info=('my', ['path']))
151
def assertChangesEqual(self,
153
paths=('path', 'path'),
154
content_change=False,
155
versioned=(True, True),
156
parent_id=('pid', 'pid'),
157
name=('name', 'name'),
158
kind=('file', 'file'),
159
executable=(False, False),
160
versioned_change='unchanged',
163
modified='unchanged',
165
reporter = InstrumentedReporter()
166
_mod_delta.report_changes([
168
file_id, paths, content_change, versioned, parent_id,
169
name, kind, executable, copied)], reporter)
170
output = reporter.calls[0]
171
self.assertEqual(paths, output[0])
172
self.assertEqual(versioned_change, output[1])
173
self.assertEqual(renamed, output[2])
174
self.assertEqual(copied, output[3])
175
self.assertEqual(modified, output[4])
176
self.assertEqual(exe_change, output[5])
177
self.assertEqual(kind, output[6])
179
def test_report_changes(self):
180
"""Test change detection of report_changes"""
181
# Ensure no changes are detected by default
182
self.assertChangesEqual(modified='unchanged', renamed=False,
183
versioned_change='unchanged',
185
self.assertChangesEqual(modified='kind changed',
186
kind=('file', 'directory'))
187
self.assertChangesEqual(modified='created', kind=(None, 'directory'))
188
self.assertChangesEqual(modified='deleted', kind=('directory', None))
189
self.assertChangesEqual(content_change=True, modified='modified')
190
self.assertChangesEqual(renamed=True, name=('old', 'new'))
191
self.assertChangesEqual(renamed=True,
192
parent_id=('old-parent', 'new-parent'))
193
self.assertChangesEqual(versioned_change='added',
194
versioned=(False, True))
195
self.assertChangesEqual(versioned_change='removed',
196
versioned=(True, False))
197
# execute bit is only detected as "changed" if the file is and was
199
self.assertChangesEqual(exe_change=True, executable=(True, False))
200
self.assertChangesEqual(exe_change=False, executable=(True, False),
201
kind=('directory', 'directory'))
202
self.assertChangesEqual(exe_change=False, modified='kind changed',
203
executable=(False, True),
204
kind=('directory', 'file'))
205
self.assertChangesEqual(parent_id=('pid', None))
207
# Now make sure they all work together
208
self.assertChangesEqual(versioned_change='removed',
209
modified='deleted', versioned=(True, False),
210
kind=('directory', None))
211
self.assertChangesEqual(versioned_change='removed',
212
modified='created', versioned=(True, False),
214
self.assertChangesEqual(versioned_change='removed',
215
modified='modified', renamed=True,
216
exe_change=True, versioned=(True, False),
217
content_change=True, name=('old', 'new'),
218
executable=(False, True))
220
def test_report_unversioned(self):
221
"""Unversioned entries are reported well."""
222
self.assertChangesEqual(file_id=None, paths=(None, 'full/path'),
224
versioned=(False, False),
225
parent_id=(None, None),
228
executable=(None, False),
229
versioned_change='unversioned',
235
class TestChangesFrom(tests.TestCaseWithTransport):
237
def show_string(self, delta, *args, **kwargs):
239
_mod_delta.report_delta(to_file, delta, *args, **kwargs)
240
return to_file.getvalue()
242
def test_kind_change(self):
243
"""Doing a status when a file has changed kind should work"""
244
tree = self.make_branch_and_tree('.')
245
self.build_tree(['filename'])
246
tree.add('filename', b'file-id')
247
tree.commit('added filename')
248
os.unlink('filename')
249
self.build_tree(['filename/'])
250
delta = tree.changes_from(tree.basis_tree())
251
self.assertEqual([('filename', 'file', 'directory')],
252
[(c.path[1], c.kind[0], c.kind[1]) for c in delta.kind_changed])
253
self.assertEqual([], delta.added)
254
self.assertEqual([], delta.removed)
255
self.assertEqual([], delta.renamed)
256
self.assertEqual([], delta.modified)
257
self.assertEqual([], delta.unchanged)
258
self.assertTrue(delta.has_changed())
259
self.assertEqual('kind changed:\n filename (file => directory)\n',
260
self.show_string(delta))
261
other_delta = _mod_delta.TreeDelta()
262
self.assertNotEqual(other_delta, delta)
263
other_delta.kind_changed = [
266
('filename', 'filename'), True, (True, True),
267
(tree.path2id(''), tree.path2id('')),
268
('filename', 'filename'),
269
('file', 'symlink'), (False, False))]
270
self.assertNotEqual(other_delta, delta)
271
other_delta.kind_changed = [
274
('filename', 'filename'), True, (True, True),
275
(tree.path2id(''), tree.path2id('')), ('filename', 'filename'),
276
('file', 'directory'), (False, False))]
277
self.assertEqual(other_delta, delta)
278
self.assertEqual('K filename (file => directory) file-id\n',
279
self.show_string(delta, show_ids=True,
282
tree.rename_one('filename', 'dirname')
283
delta = tree.changes_from(tree.basis_tree())
284
self.assertEqual([], delta.kind_changed)
285
# This loses the fact that kind changed, remembering it as a
287
self.assertEqual([TreeChange(
288
b'file-id', ('filename', 'dirname'), True,
289
(True, True), (tree.path2id(''), tree.path2id('')),
290
('filename', 'dirname'), ('file', 'directory'), (False, False))],
292
self.assertTrue(delta.has_changed())
295
class TestDeltaShow(tests.TestCaseWithTransport):
297
def _get_delta(self):
298
# We build the delta from a real tree to avoid depending on internal
299
# implementation details.
300
wt = self.make_branch_and_tree('branch')
301
self.build_tree_contents([('branch/f1', b'1\n'),
302
('branch/f2', b'2\n'),
303
('branch/f3', b'3\n'),
304
('branch/f4', b'4\n'),
305
('branch/f5', b'5\n'),
308
wt.add(['f1', 'f2', 'f3', 'f4', 'dir'],
309
[b'f1-id', b'f2-id', b'f3-id', b'f4-id', b'dir-id'])
310
wt.commit('commit one', rev_id=b'1')
312
# TODO add rename,removed,etc. here?
314
os.unlink('branch/f5')
316
long_status = """added:
325
short_status = """A dir/
333
repo = wt.branch.repository
334
d = wt.changes_from(repo.revision_tree(_mod_revision.NULL_REVISION))
335
return d, long_status, short_status
337
def test_short_status(self):
338
d, long_status, short_status = self._get_delta()
340
_mod_delta.report_delta(out, d, short_status=True)
341
self.assertEqual(short_status, out.getvalue())
343
def test_long_status(self):
344
d, long_status, short_status = self._get_delta()
346
_mod_delta.report_delta(out, d, short_status=False)
347
self.assertEqual(long_status, out.getvalue())
349
def test_predicate_always(self):
350
d, long_status, short_status = self._get_delta()
355
_mod_delta.report_delta(out, d, short_status=True, predicate=always)
356
self.assertEqual(short_status, out.getvalue())
358
def test_short_status_path_predicate(self):
359
d, long_status, short_status = self._get_delta()
364
_mod_delta.report_delta(out, d, short_status=True, predicate=only_f2)
365
self.assertEqual("A f2\n", out.getvalue())
367
def test_long_status_path_predicate(self):
368
d, long_status, short_status = self._get_delta()
373
_mod_delta.report_delta(out, d, short_status=False, predicate=only_f2)
374
self.assertEqual("added:\n f2\n", out.getvalue())
added
removed
breezy/tests/test_delta.py
