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