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