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