/brz/remove-bazaar

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