~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
16
2225.1.1 by Aaron Bentley
Added revert change display, with tests
17
from bzrlib import (
18
    osutils,
19
    )
5121.2.4 by Jelmer Vernooij
Remove more unused imports.
20
from bzrlib.trace import is_quiet
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
21
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
22
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
23
class TreeDelta(object):
24
    """Describes changes from one tree to another.
25
3874.3.3 by Vincent Ladeuil
Finish TreeDelta.show() refactoring.
26
    Contains seven lists:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
27
28
    added
29
        (path, id, kind)
30
    removed
31
        (path, id, kind)
32
    renamed
1398 by Robert Collins
integrate in Gustavos x-bit patch
33
        (oldpath, newpath, id, kind, text_modified, meta_modified)
3874.3.3 by Vincent Ladeuil
Finish TreeDelta.show() refactoring.
34
    kind_changed
35
        (path, id, old_kind, new_kind)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
36
    modified
1398 by Robert Collins
integrate in Gustavos x-bit patch
37
        (path, id, kind, text_modified, meta_modified)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
38
    unchanged
39
        (path, id, kind)
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
40
    unversioned
3874.3.2 by Vincent Ladeuil
Fix typo.
41
        (path, None, kind)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
42
43
    Each id is listed only once.
44
45
    Files that are both modified and renamed are listed only in
1092.2.6 by Robert Collins
symlink support updated to work
46
    renamed, with the text_modified flag true. The text_modified
4775.1.1 by Martin Pool
Remove several 'the the' typos
47
    applies either to the content of the file or the target of the
1092.2.6 by Robert Collins
symlink support updated to work
48
    symbolic link, depending of the kind of file.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
49
50
    Files are only considered renamed if their name has changed or
51
    their parent directory has changed.  Renaming a directory
52
    does not count as renaming all its contents.
53
54
    The lists are normally sorted when the delta is created.
55
    """
56
    def __init__(self):
57
        self.added = []
58
        self.removed = []
59
        self.renamed = []
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
60
        self.kind_changed = []
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
61
        self.modified = []
62
        self.unchanged = []
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
63
        self.unversioned = []
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
64
65
    def __eq__(self, other):
66
        if not isinstance(other, TreeDelta):
67
            return False
68
        return self.added == other.added \
69
               and self.removed == other.removed \
70
               and self.renamed == other.renamed \
71
               and self.modified == other.modified \
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
72
               and self.unchanged == other.unchanged \
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
73
               and self.kind_changed == other.kind_changed \
74
               and self.unversioned == other.unversioned
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
75
76
    def __ne__(self, other):
77
        return not (self == other)
78
79
    def __repr__(self):
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
80
        return "TreeDelta(added=%r, removed=%r, renamed=%r," \
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
81
            " kind_changed=%r, modified=%r, unchanged=%r," \
82
            " unversioned=%r)" % (self.added,
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
83
            self.removed, self.renamed, self.kind_changed, self.modified,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
84
            self.unchanged, self.unversioned)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
85
86
    def has_changed(self):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
87
        return bool(self.modified
88
                    or self.added
89
                    or self.removed
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
90
                    or self.renamed
91
                    or self.kind_changed)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
92
93
    def touches_file_id(self, file_id):
94
        """Return True if file_id is modified by this delta."""
95
        for l in self.added, self.removed, self.modified:
96
            for v in l:
97
                if v[1] == file_id:
98
                    return True
99
        for v in self.renamed:
100
            if v[2] == file_id:
101
                return True
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
102
        for v in self.kind_changed:
103
            if v[1] == file_id:
104
                return True
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
105
        return False
3874.2.1 by Vincent Ladeuil
Empty lines.
106
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
107
    def get_changes_as_text(self, show_ids=False, show_unchanged=False,
5076.4.3 by Arnaud Jeansen
Port get_changes_as_text to the report callbacks
108
                            short_status=False):
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
109
        import StringIO
110
        output = StringIO.StringIO()
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
111
        report_delta(output, self, short_status, show_ids, show_unchanged)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
112
        return output.getvalue()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
113
1731.1.33 by Aaron Bentley
Revert no-special-root changes
114
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
115
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
116
                   include_root, extra_trees=None,
2655.2.1 by Marius Kruger
InterTree.compare and delta._compare_trees did not pass its
117
                   require_versioned=False, want_unversioned=False):
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
118
    """Worker function that implements Tree.changes_from."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
119
    delta = TreeDelta()
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
120
    # mutter('start compare_trees')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
121
2012.1.2 by Aaron Bentley
reimplement compare_trees
122
    for (file_id, path, content_change, versioned, parent_id, name, kind,
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
123
         executable) in new_tree.iter_changes(old_tree, want_unchanged,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
124
            specific_files, extra_trees=extra_trees,
2655.2.1 by Marius Kruger
InterTree.compare and delta._compare_trees did not pass its
125
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
126
            want_unversioned=want_unversioned):
127
        if versioned == (False, False):
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
128
            delta.unversioned.append((path[1], None, kind[1]))
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
129
            continue
2012.1.8 by Aaron Bentley
Merge from bzr.dev
130
        if not include_root and (None, None) == parent_id:
2012.1.2 by Aaron Bentley
reimplement compare_trees
131
            continue
2012.1.4 by Aaron Bentley
Simplify add/remove code
132
        fully_present = tuple((versioned[x] and kind[x] is not None) for
133
                              x in range(2))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
134
        if fully_present[0] != fully_present[1]:
135
            if fully_present[1] is True:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
136
                delta.added.append((path[1], file_id, kind[1]))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
137
            else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
138
                delta.removed.append((path[0], file_id, kind[0]))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
139
        elif fully_present[0] is False:
140
            continue
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
141
        elif name[0] != name[1] or parent_id[0] != parent_id[1]:
2012.1.4 by Aaron Bentley
Simplify add/remove code
142
            # If the name changes, or the parent_id changes, we have a rename
143
            # (if we move a parent, that doesn't count as a rename for the
144
            # file)
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
145
            delta.renamed.append((path[0],
146
                                  path[1],
147
                                  file_id,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
148
                                  kind[1],
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
149
                                  content_change,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
150
                                  (executable[0] != executable[1])))
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
151
        elif kind[0] != kind[1]:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
152
            delta.kind_changed.append((path[1], file_id, kind[0], kind[1]))
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
153
        elif content_change or executable[0] != executable[1]:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
154
            delta.modified.append((path[1], file_id, kind[1],
155
                                   content_change,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
156
                                   (executable[0] != executable[1])))
2012.1.2 by Aaron Bentley
reimplement compare_trees
157
        else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
158
            delta.unchanged.append((path[1], file_id, kind[1]))
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
159
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
160
    delta.removed.sort()
161
    delta.added.sort()
162
    delta.renamed.sort()
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
163
    # TODO: jam 20060529 These lists shouldn't need to be sorted
164
    #       since we added them in alphabetical order.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
165
    delta.modified.sort()
166
    delta.unchanged.sort()
167
168
    return delta
2225.1.1 by Aaron Bentley
Added revert change display, with tests
169
170
1551.10.25 by Aaron Bentley
Make ChangeReporter private
171
class _ChangeReporter(object):
2225.1.1 by Aaron Bentley
Added revert change display, with tests
172
    """Report changes between two trees"""
173
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
174
    def __init__(self, output=None, suppress_root_add=True,
3586.1.30 by Ian Clatworthy
add view support to change reporting
175
                 output_file=None, unversioned_filter=None, view_info=None):
1551.10.7 by Aaron Bentley
Use new-style output for status
176
        """Constructor
177
178
        :param output: a function with the signature of trace.note, i.e.
179
            accepts a format and parameters.
180
        :param supress_root_add: If true, adding the root will be ignored
181
            (i.e. when a tree has just been initted)
1551.10.8 by Aaron Bentley
Make ChangeReporter interface nicer
182
        :param output_file: If supplied, a file-like object to write to.
183
            Only one of output and output_file may be supplied.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
184
        :param unversioned_filter: A filter function to be called on
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
185
            unversioned files. This should return True to ignore a path.
186
            By default, no filtering takes place.
3586.1.30 by Ian Clatworthy
add view support to change reporting
187
        :param view_info: A tuple of view_name,view_files if only
188
            items inside a view are to be reported on, or None for
189
            no view filtering.
1551.10.7 by Aaron Bentley
Use new-style output for status
190
        """
1551.10.8 by Aaron Bentley
Make ChangeReporter interface nicer
191
        if output_file is not None:
192
            if output is not None:
193
                raise BzrError('Cannot specify both output and output_file')
194
            def output(fmt, *args):
195
                output_file.write((fmt % args) + '\n')
2225.1.1 by Aaron Bentley
Added revert change display, with tests
196
        self.output = output
197
        if self.output is None:
198
            from bzrlib import trace
199
            self.output = trace.note
1551.10.7 by Aaron Bentley
Use new-style output for status
200
        self.suppress_root_add = suppress_root_add
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
201
        self.modified_map = {'kind changed': 'K',
202
                             'unchanged': ' ',
203
                             'created': 'N',
204
                             'modified': 'M',
205
                             'deleted': 'D'}
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
206
        self.versioned_map = {'added': '+', # versioned target
207
                              'unchanged': ' ', # versioned in both
208
                              'removed': '-', # versioned in source
209
                              'unversioned': '?', # versioned in neither
210
                              }
211
        self.unversioned_filter = unversioned_filter
3586.1.30 by Ian Clatworthy
add view support to change reporting
212
        if view_info is None:
213
            self.view_name = None
214
            self.view_files = []
215
        else:
216
            self.view_name = view_info[0]
217
            self.view_files = view_info[1]
218
            self.output("Operating on whole tree but only reporting on "
219
                        "'%s' view." % (self.view_name,))
2225.1.1 by Aaron Bentley
Added revert change display, with tests
220
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
221
    def report(self, file_id, paths, versioned, renamed, modified, exe_change,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
222
               kind):
223
        """Report one change to a file
2225.1.5 by Aaron Bentley
Clean up whitespace changes
224
2225.1.1 by Aaron Bentley
Added revert change display, with tests
225
        :param file_id: The file_id of the file
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
226
        :param path: The old and new paths as generated by Tree.iter_changes.
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
227
        :param versioned: may be 'added', 'removed', 'unchanged', or
228
            'unversioned.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
229
        :param renamed: may be True or False
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
230
        :param modified: may be 'created', 'deleted', 'kind changed',
2225.1.1 by Aaron Bentley
Added revert change display, with tests
231
            'modified' or 'unchanged'.
232
        :param exe_change: True if the execute bit has changed
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
233
        :param kind: A pair of file kinds, as generated by Tree.iter_changes.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
234
            None indicates no file present.
235
        """
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
236
        if is_quiet():
237
            return
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
238
        if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
1551.10.7 by Aaron Bentley
Use new-style output for status
239
            return
3586.1.30 by Ian Clatworthy
add view support to change reporting
240
        if self.view_files and not osutils.is_inside_any(self.view_files,
241
            paths[1]):
242
            return
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
243
        if versioned == 'unversioned':
244
            # skip ignored unversioned files if needed.
245
            if self.unversioned_filter is not None:
246
                if self.unversioned_filter(paths[1]):
247
                    return
248
            # dont show a content change in the output.
249
            modified = 'unchanged'
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
250
        # we show both paths in the following situations:
251
        # the file versioning is unchanged AND
252
        # ( the path is different OR
253
        #   the kind is different)
254
        if (versioned == 'unchanged' and
255
            (renamed or modified == 'kind changed')):
256
            if renamed:
257
                # on a rename, we show old and new
258
                old_path, path = paths
259
            else:
2592.3.231 by Martin Pool
typo
260
                # if it's not renamed, we're showing both for kind changes
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
261
                # so only show the new path
262
                old_path, path = paths[1], paths[1]
263
            # if the file is not missing in the source, we show its kind
264
            # when we show two paths.
265
            if kind[0] is not None:
266
                old_path += osutils.kind_marker(kind[0])
267
            old_path += " => "
2255.2.231 by Robert Collins
Add test showing reverts UI working as Aaron intended it to.
268
        elif versioned == 'removed':
269
            # not present in target
270
            old_path = ""
271
            path = paths[0]
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
272
        else:
273
            old_path = ""
274
            path = paths[1]
2225.1.1 by Aaron Bentley
Added revert change display, with tests
275
        if renamed:
276
            rename = "R"
277
        else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
278
            rename = self.versioned_map[versioned]
279
        # we show the old kind on the new path when the content is deleted.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
280
        if modified == 'deleted':
281
            path += osutils.kind_marker(kind[0])
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
282
        # otherwise we always show the current kind when there is one
1551.10.11 by Aaron Bentley
Handle case where file-id only is added
283
        elif kind[1] is not None:
2225.1.1 by Aaron Bentley
Added revert change display, with tests
284
            path += osutils.kind_marker(kind[1])
285
        if exe_change:
286
            exe = '*'
287
        else:
288
            exe = ' '
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
289
        self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
290
                    old_path, path)
291
292
def report_changes(change_iterator, reporter):
293
    """Report the changes from a change iterator.
294
295
    This is essentially a translation from low-level to medium-level changes.
296
    Further processing may be required to produce a human-readable output.
297
    Unfortunately, some tree-changing operations are very complex
298
    :change_iterator: an iterator or sequence of changes in the format
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
299
        generated by Tree.iter_changes
1551.10.25 by Aaron Bentley
Make ChangeReporter private
300
    :param reporter: The _ChangeReporter that will report the changes.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
301
    """
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
302
    versioned_change_map = {
303
        (True, True)  : 'unchanged',
304
        (True, False) : 'removed',
305
        (False, True) : 'added',
306
        (False, False): 'unversioned',
307
        }
2225.1.1 by Aaron Bentley
Added revert change display, with tests
308
    for (file_id, path, content_change, versioned, parent_id, name, kind,
309
         executable) in change_iterator:
310
        exe_change = False
311
        # files are "renamed" if they are moved or if name changes, as long
312
        # as it had a value
1551.11.3 by Aaron Bentley
Use tree transform to emit upcoming change list
313
        if None not in name and None not in parent_id and\
314
            (name[0] != name[1] or parent_id[0] != parent_id[1]):
2225.1.1 by Aaron Bentley
Added revert change display, with tests
315
            renamed = True
316
        else:
317
            renamed = False
318
        if kind[0] != kind[1]:
319
            if kind[0] is None:
320
                modified = "created"
321
            elif kind[1] is None:
322
                modified = "deleted"
323
            else:
324
                modified = "kind changed"
325
        else:
326
            if content_change:
327
                modified = "modified"
328
            else:
329
                modified = "unchanged"
330
            if kind[1] == "file":
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
331
                exe_change = (executable[0] != executable[1])
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
332
        versioned_change = versioned_change_map[versioned]
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
333
        reporter.report(file_id, path, versioned_change, renamed, modified,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
334
                        exe_change, kind)
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
335
5076.4.4 by Arnaud Jeansen
Add a unified report_delta method
336
def report_delta(to_file, delta, short_status=False, show_ids=False, 
337
         show_unchanged=False, indent='', filter=None):
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
338
    """Output this delta in status-like form to to_file.
339
340
    :param to_file: A file-like object where the output is displayed.
341
342
    :param delta: A TreeDelta containing the changes to be displayed
343
344
    :param short_status: Single-line status if True.
345
346
    :param show_ids: Output the file ids if True.
347
348
    :param show_unchanged: Output the unchanged files if True.
349
350
    :param indent: Added at the beginning of all output lines (for merged
351
        revisions).
352
353
    :param filter: A callable receiving a path and a file id and
354
        returning True if the path should be displayed.
355
    """
356
357
    def decorate_path(path, kind, meta_modified=None):
358
        if kind == 'directory':
359
            path += '/'
360
        elif kind == 'symlink':
361
            path += '@'
362
        if meta_modified:
363
            path += '*'
364
        return path
365
366
    def show_more_renamed(item):
367
        (oldpath, file_id, kind,
368
         text_modified, meta_modified, newpath) = item
369
        dec_new_path = decorate_path(newpath, kind, meta_modified)
370
        to_file.write(' => %s' % dec_new_path)
371
        if text_modified or meta_modified:
372
            extra_modified.append((newpath, file_id, kind,
373
                                   text_modified, meta_modified))
374
375
    def show_more_kind_changed(item):
376
        (path, file_id, old_kind, new_kind) = item
377
        to_file.write(' (%s => %s)' % (old_kind, new_kind))
378
379
    def show_path(path, file_id, kind, meta_modified,
380
                  default_format, with_file_id_format):
381
        dec_path = decorate_path(path, kind, meta_modified)
382
        if show_ids:
383
            to_file.write(with_file_id_format % dec_path)
384
        else:
385
            to_file.write(default_format % dec_path)
386
387
    def show_list(files, long_status_name, short_status_letter,
388
                  default_format='%s', with_file_id_format='%-30s',
389
                  show_more=None):
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
390
        if files:
391
            header_shown = False
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
392
            if short_status:
393
                prefix = short_status_letter
394
            else:
395
                prefix = ''
396
            prefix = indent + prefix + '  '
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
397
398
            for item in files:
399
                path, file_id, kind = item[:3]
400
                if (filter is not None and not filter(path, file_id)):
401
                    continue
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
402
                if not header_shown and not short_status:
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
403
                    to_file.write(indent + long_status_name + ':\n')
404
                    header_shown = True
405
                meta_modified = None
406
                if len(item) == 5:
407
                    meta_modified = item[4]
408
409
                to_file.write(prefix)
410
                show_path(path, file_id, kind, meta_modified,
411
                          default_format, with_file_id_format)
412
                if show_more is not None:
413
                    show_more(item)
414
                if show_ids:
415
                    to_file.write(' %s' % file_id)
416
                to_file.write('\n')
417
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
418
    show_list(delta.removed, 'removed', 'D')
419
    show_list(delta.added, 'added', 'A')
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
420
    extra_modified = []
421
    # Reorder delta.renamed tuples so that all lists share the same
422
    # order for their 3 first fields and that they also begin like
423
    # the delta.modified tuples
424
    renamed = [(p, i, k, tm, mm, np)
425
               for  p, np, i, k, tm, mm  in delta.renamed]
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
426
    show_list(renamed, 'renamed', 'R', with_file_id_format='%s',
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
427
              show_more=show_more_renamed)
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
428
    show_list(delta.kind_changed, 'kind changed', 'K',
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
429
              with_file_id_format='%s',
430
              show_more=show_more_kind_changed)
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
431
    show_list(delta.modified + extra_modified, 'modified', 'M')
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
432
    if show_unchanged:
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
433
        show_list(delta.unchanged, 'unchanged', 'S')
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
434
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
435
    show_list(delta.unversioned, 'unknown', ' ')
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
436